| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/disk.py | 10 | ||||
| -rw-r--r-- | archinstall/lib/locale_helpers.py | 4 |
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index 60c264e1..f8703ae3 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -496,7 +496,7 @@ class Filesystem: def use_entire_disk(self, root_filesystem_type='ext4'): log(f"Using and formatting the entire {self.blockdevice}.", level=logging.DEBUG) if has_uefi(): - self.add_partition('primary', start='1MiB', end='513MiB', format='fat32') + self.add_partition('primary', start='1MiB', end='513MiB', partition_format='fat32') self.set_name(0, 'EFI') self.set(0, 'boot on') # TODO: Probably redundant because in GPT mode 'esp on' is an alias for "boot on"? @@ -521,17 +521,17 @@ class Filesystem: self.blockdevice.partition[0].target_mountpoint = '/' self.blockdevice.partition[0].allow_formatting = True - def add_partition(self, type, start, end, format=None): + def add_partition(self, partition_type, start, end, partition_format=None): log(f'Adding partition to {self.blockdevice}', level=logging.INFO) previous_partitions = self.blockdevice.partitions if self.mode == MBR: if len(self.blockdevice.partitions) > 3: DiskError("Too many partitions on disk, MBR disks can only have 3 parimary partitions") - if format: - partitioning = self.parted(f'{self.blockdevice.device} mkpart {type} {format} {start} {end}') == 0 + if partition_format: + partitioning = self.parted(f'{self.blockdevice.device} mkpart {partition_type} {partition_format} {start} {end}') == 0 else: - partitioning = self.parted(f'{self.blockdevice.device} mkpart {type} {start} {end}') == 0 + partitioning = self.parted(f'{self.blockdevice.device} mkpart {partition_type} {start} {end}') == 0 if partitioning: start_wait = time.time() diff --git a/archinstall/lib/locale_helpers.py b/archinstall/lib/locale_helpers.py index addc8da1..2db429fd 100644 --- a/archinstall/lib/locale_helpers.py +++ b/archinstall/lib/locale_helpers.py @@ -27,9 +27,9 @@ def verify_keyboard_layout(layout): return False -def search_keyboard_layout(filter): +def search_keyboard_layout(layout_filter): for language in list_keyboard_languages(): - if filter.lower() in language.lower(): + if layout_filter.lower() in language.lower(): yield language |