RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor `_add_systemd_bootloader()` newlines (#2173) 

* Refactor `_add_systemd_bootloader()` newlines

* Revert f-string change
This commit is contained in:
codefiles 2023-10-16 10:42:42 -04:00 committed by GitHub
parent c4c5cc4224
commit 5dda32f17e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
archinstall/lib/installer.py
View File

@ -818,15 +818,14 @@ class Installer:
# Modify or create a loader.conf # Modify or create a loader.conf
loader_conf = loader_dir / 'loader.conf' loader_conf = loader_dir / 'loader.conf'
default = f'default {self.init_time}_{self.kernels[0]}.conf\n' default = f'default {self.init_time}_{self.kernels[0]}.conf'
try: try:
with loader_conf.open() as loader: loader_data = loader_conf.read_text().splitlines()
loader_data = loader.readlines()
except FileNotFoundError: except FileNotFoundError:
loader_data = [ loader_data = [
default, default,
'timeout 15\n' 'timeout 15'
] ]
else: else:
for index, line in enumerate(loader_data): for index, line in enumerate(loader_data):
@ -836,41 +835,40 @@ class Installer:
# We add in the default timeout to support dual-boot # We add in the default timeout to support dual-boot
loader_data[index] = line.removeprefix('#') loader_data[index] = line.removeprefix('#')
with loader_conf.open('w') as loader: loader_conf.write_text('\n'.join(loader_data) + '\n')
loader.writelines(loader_data)
# Ensure that the $BOOT/loader/entries/ directory exists before we try to create files in it # Ensure that the $BOOT/loader/entries/ directory exists before we try to create files in it
entries_dir = loader_dir / 'entries' entries_dir = loader_dir / 'entries'
entries_dir.mkdir(parents=True, exist_ok=True) entries_dir.mkdir(parents=True, exist_ok=True)
comments = ( comments = (
'# Created by: archinstall\n', '# Created by: archinstall',
f'# Created on: {self.init_time}\n' f'# Created on: {self.init_time}'
) )
microcode = [] microcode = []
if ucode := self._get_microcode(): if ucode := self._get_microcode():
microcode.append(f'initrd /{ucode}\n') microcode.append(f'initrd /{ucode}')
else: else:
debug('Archinstall will not add any ucode to systemd-boot config.') debug('Archinstall will not add any ucode to systemd-boot config.')
options = 'options ' + ' '.join(self._get_kernel_params(root_partition)) + '\n' options = 'options ' + ' '.join(self._get_kernel_params(root_partition))
for kernel in self.kernels: for kernel in self.kernels:
for variant in ("", "-fallback"): for variant in ("", "-fallback"):
# Setup the loader entry # Setup the loader entry
entry = [ entry = [
*comments, *comments,
f'title Arch Linux ({kernel}{variant})\n', f'title Arch Linux ({kernel}{variant})',
f'linux /vmlinuz-{kernel}\n', f'linux /vmlinuz-{kernel}',
*microcode, *microcode,
f'initrd /initramfs-{kernel}{variant}.img\n', f'initrd /initramfs-{kernel}{variant}.img',
options, options,
] ]
entry_conf = entries_dir / f'{self.init_time}_{kernel}{variant}.conf' entry_conf = entries_dir / f'{self.init_time}_{kernel}{variant}.conf'
entry_conf.write_text(''.join(entry)) entry_conf.write_text('\n'.join(entry) + '\n')
self.helper_flags['bootloader'] = 'systemd' self.helper_flags['bootloader'] = 'systemd'