Merge pull request #502 from advaithm/bootload-fix
fixed bootloader flag not being set
This commit is contained in:
commit
845ea481aa
|
|
@ -453,6 +453,7 @@ class Installer:
|
||||||
self.pacstrap('efibootmgr')
|
self.pacstrap('efibootmgr')
|
||||||
o = b''.join(SysCommand(f'/usr/bin/arch-chroot {self.target} grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB'))
|
o = b''.join(SysCommand(f'/usr/bin/arch-chroot {self.target} grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB'))
|
||||||
SysCommand('/usr/bin/arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg')
|
SysCommand('/usr/bin/arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg')
|
||||||
|
self.helper_flags['bootloder'] = True
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
root_device = subprocess.check_output(f'basename "$(readlink -f /sys/class/block/{root_partition.path.replace("/dev/", "")}/..)"', shell=True).decode().strip()
|
root_device = subprocess.check_output(f'basename "$(readlink -f /sys/class/block/{root_partition.path.replace("/dev/", "")}/..)"', shell=True).decode().strip()
|
||||||
|
|
@ -460,7 +461,7 @@ class Installer:
|
||||||
root_device = f"{root_partition.path}"
|
root_device = f"{root_partition.path}"
|
||||||
o = b''.join(SysCommand(f'/usr/bin/arch-chroot {self.target} grub-install --target=i386-pc /dev/{root_device}'))
|
o = b''.join(SysCommand(f'/usr/bin/arch-chroot {self.target} grub-install --target=i386-pc /dev/{root_device}'))
|
||||||
SysCommand('/usr/bin/arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg')
|
SysCommand('/usr/bin/arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg')
|
||||||
self.helper_flags['bootloader'] = bootloader
|
self.helper_flags['bootloader'] = True
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
raise RequirementError(f"Unknown (or not yet implemented) bootloader requested: {bootloader}")
|
raise RequirementError(f"Unknown (or not yet implemented) bootloader requested: {bootloader}")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue