Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2021-09-06 12:22:57 +0000
committerAnton Hvornum <anton.feeds@gmail.com>2021-09-06 12:22:57 +0000
commit025dc83194d2bfc0bde73681abf5d280c745806d (patch)
treefd9f46eb5447ade86102806493c1f12f8e6f9e8c /archinstall/lib
parent51eb05691a5845652a9dc583de05519f095961f3 (diff)
parentcc6491f0a5d9b7795375a5a86e03fc9eb1c762c7 (diff)
Corrected some minor modifications mentioned in #595 as well as merged in latest changes from master. For future PR's do create a patch-branch for upstream patches to avoid changes to your local repo.
Diffstat (limited to 'archinstall/lib')
-rw-r--r--archinstall/lib/disk.py16
-rw-r--r--archinstall/lib/user_interaction.py3
2 files changed, 11 insertions, 8 deletions
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index 954dc732..415f45e6 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -523,13 +523,17 @@ class Filesystem:
self.blockdevice.partition[0].allow_formatting = True
self.blockdevice.partition[1].allow_formatting = True
else:
- self.add_partition('primary', start='1MiB', end='513MiB', partition_format='ext2')
+ if not self.parted_mklabel(self.blockdevice.device, "msdos"):
+ raise KeyError(f"Could not create a MSDOS label on {self}")
+
+ self.add_partition('primary', start='1MiB', end='513MiB', partition_format='ext4')
self.set(0, 'boot on')
self.add_partition('primary', start='513MiB', end='100%')
- self.blockdevice.partition[0].filesystem = 'ext2'
+ self.blockdevice.partition[0].filesystem = 'ext4' # TODO: Up for debate weither or not this should be user-supplied: https://github.com/archlinux/archinstall/pull/595/files
self.blockdevice.partition[1].filesystem = root_filesystem_type
+ log(f"Set the boot partition {self.blockdevice.partition[0]} to use filesystem {'ext4'}.", level=logging.DEBUG)
log(f"Set the root partition {self.blockdevice.partition[1]} to use filesystem {root_filesystem_type}.", level=logging.DEBUG)
self.blockdevice.partition[0].target_mountpoint = '/boot'
@@ -552,11 +556,9 @@ class Filesystem:
if partitioning:
start_wait = time.time()
- while previous_partitions == self.blockdevice.partitions:
- time.sleep(0.025) # Let the new partition come up in the kernel
- if time.time() - start_wait > 10:
- raise DiskError(f"New partition never showed up after adding new partition on {self} (timeout 10 seconds).")
-
+ time.sleep(0.025) # Let the new partition come up in the kernel
+ if time.time() - start_wait > 20:
+ raise DiskError(f"New partition never showed up after adding new partition on {self} (timeout 10 seconds).")
return True
def set_name(self, partition: int, name: str):
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index 3c1ba04f..44dabbe6 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -710,7 +710,8 @@ def select_driver(options=AVAILABLE_GFX_DRIVERS):
if has_nvidia_graphics():
print('For the best compatibility with your Nvidia hardware, you may want to use the Nvidia proprietary driver.')
- arguments['gfx_driver'] = generic_select(drivers, input_text="Select a graphics driver or leave blank to install all open-source drivers: ")
+ if not arguments.get('gfx_driver', None):
+ arguments['gfx_driver'] = generic_select(drivers, input_text="Select a graphics driver or leave blank to install all open-source drivers: ")
if arguments.get('gfx_driver', None) is None:
arguments['gfx_driver'] = "All open-source (default)"