From 685d7db4c9b8caff105de90731c039809f971c09 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 15 Aug 2020 14:23:03 +0100 Subject: Fix failure to update grub2 config when service_harddrake attempts to add/remove the nokmsboot option. --- perl-install/bootloader.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'perl-install/bootloader.pm') diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 0c6a1292b..8cd392b0e 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -2104,10 +2104,12 @@ sub write_grub2 { write_grub2_sysconfig($bootloader, $o_all_hds, $o_backup_extension); my $f1 = "$::prefix/boot/grub2/grub.cfg"; - # we won't just rename as update-grub2 (more likely os-prober may fail): + #- we won't just rename as grub2-mkconfig (more likely os-prober) may fail: cp_af($f1, $f1 . '.old') if -e $f1; - run_program::rooted($::prefix, 'update-grub2', '2>', \$error) or die "update-grub2 failed: $error"; - log::l("update-grub2 logs: $error"); + #- don't use the update-grub2 script here, it hangs when run by service_harddrake + #- during boot because it causes systemd to try to start a user session + run_program::rooted($::prefix, 'grub2-mkconfig', '2>', \$error, '-o', '/boot/grub2/grub.cfg') or die "grub2-mkconfig failed: $error"; + log::l("grub2-mkconfig logs: $error"); write_grub2_default_entry($bootloader, $o_all_hds, $o_backup_extension); check_enough_space(); -- cgit v1.2.1