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

Merge pull request #381 from archlinux/torxed-fix-350 

Fixes #350. This reverts an old hot-fix to make systemd-boot not wipe out windows boot loader.
This commit is contained in:
Anton Hvornum 2021-05-14 19:07:09 +00:00 committed by GitHub
parent dc48bad941 4b6a7514c9
commit 71b14ec9fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archinstall/lib/installer.py
View File

@ -381,7 +381,7 @@ class Installer():
# And in which case we should do some clean up. # And in which case we should do some clean up.
# Install the boot loader # Install the boot loader
sys_command(f'/usr/bin/arch-chroot {self.target} bootctl --no-variables --path=/boot install') sys_command(f'/usr/bin/arch-chroot {self.target} bootctl --path=/boot install')
# Modify or create a loader.conf # Modify or create a loader.conf
if os.path.isfile(f'{self.target}/boot/loader/loader.conf'): if os.path.isfile(f'{self.target}/boot/loader/loader.conf'):
@ -397,8 +397,11 @@ class Installer():
for line in loader_data: for line in loader_data:
if line[:8] == 'default ': if line[:8] == 'default ':
loader.write(f'default {self.init_time}\n') loader.write(f'default {self.init_time}\n')
elif line[:8] == '#timeout' and 'timeout 5' not in loader_data:
# We add in the default timeout to support dual-boot
loader.write(f"{line[1:]}\n")
else: else:
loader.write(f"{line}") loader.write(f"{line}\n")
## For some reason, blkid and /dev/disk/by-uuid are not getting along well. ## For some reason, blkid and /dev/disk/by-uuid are not getting along well.
## And blkid is wrong in terms of LUKS. ## And blkid is wrong in terms of LUKS.