From 10fc344097c392685d286e585e91493556c96847 Mon Sep 17 00:00:00 2001 From: codefiles <11915375+codefiles@users.noreply.github.com> Date: Fri, 30 Jun 2023 14:27:49 -0400 Subject: Refactor `_add_systemd_bootloader()` entries options (#1909) * Refactor `_add_systemd_bootloader()` entries options * Added suggested tweak https://github.com/archlinux/archinstall/pull/1907#discussion_r1247558250 --------- Co-authored-by: Anton Hvornum --- archinstall/lib/installer.py | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) (limited to 'archinstall') diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 5d932981..083bd7c9 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -755,19 +755,7 @@ class Installer: "Archinstall won't add any ucode to systemd-boot config.", ) - # blkid doesn't trigger on loopback devices really well, - # so we'll use the old manual method until we get that sorted out. - - options_entry = f'rw rootfstype={root_partition.safe_fs_type.fs_type_mount} {" ".join(self._kernel_params)}' - - for sub_vol in root_partition.btrfs_subvols: - if sub_vol.is_root(): - options_entry = f"rootflags=subvol={sub_vol.name} " + options_entry - - # Zswap should be disabled when using zram. - # https://github.com/archlinux/archinstall/issues/881 - if self._zram_enabled: - options_entry = "zswap.enabled=0 " + options_entry + options_entry = [] if root_partition.safe_fs_type.is_crypto(): # TODO: We need to detect if the encrypted device is a whole disk encryption, @@ -776,17 +764,33 @@ class Installer: if self._disk_encryption and self._disk_encryption.hsm_device: # Note: lsblk UUID must be used, not PARTUUID for sd-encrypt to work - kernel_options = f'rd.luks.name={root_partition.uuid}=luksdev' + options_entry.append(f'rd.luks.name={root_partition.uuid}=luksdev') # Note: tpm2-device and fido2-device don't play along very well: # https://github.com/archlinux/archinstall/pull/1196#issuecomment-1129715645 - kernel_options += ' rd.luks.options=fido2-device=auto,password-echo=no' + options_entry.append('rd.luks.options=fido2-device=auto,password-echo=no') else: - kernel_options = f'cryptdevice=PARTUUID={root_partition.partuuid}:luksdev' + options_entry.append(f'cryptdevice=PARTUUID={root_partition.partuuid}:luksdev') - cmdline = f'{kernel_options} root=/dev/mapper/luksdev {options_entry}' + options_entry.append('root=/dev/mapper/luksdev') else: debug(f'Identifying root partition by PARTUUID: {root_partition.partuuid}') - cmdline = f'root=PARTUUID={root_partition.partuuid} {options_entry}' + options_entry.append(f'root=PARTUUID={root_partition.partuuid}') + + # Zswap should be disabled when using zram. + # https://github.com/archlinux/archinstall/issues/881 + if self._zram_enabled: + options_entry.append('zswap.enabled=0') + + for sub_vol in root_partition.btrfs_subvols: + if sub_vol.is_root(): + options_entry.append(f'rootflags=subvol={sub_vol.name}') + break + + options_entry.append('rw') + options_entry.append(f'rootfstype={root_partition.safe_fs_type.fs_type_mount}') + options_entry.extend(self._kernel_params) + + options = 'options ' + ' '.join(options_entry) + '\n' for kernel in self.kernels: for variant in ("", "-fallback"): @@ -799,7 +803,7 @@ class Installer: entry_lines.append(f'linux /vmlinuz-{kernel}\n') entry_lines.extend(microcode) entry_lines.append(f'initrd /initramfs-{kernel}{variant}.img\n') - entry_lines.append(f'options {cmdline}\n') + entry_lines.append(options) entry.writelines(entry_lines) -- cgit v1.2.3-70-g09d2