diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/bootloader.pm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 59172e161..d511bf6be 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -298,15 +298,12 @@ sub is_grub2_already_crypted { =item read_grub2 ($o_fstab) -Read back GRUB2 config + C</boot/grub2/drakboot.conf> +Read back GRUB2 config =cut sub read_grub2() { - my %bootloader = getVarsFromSh("$::prefix/boot/grub2/drakboot.conf"); - if (is_empty_hash_ref(\%bootloader)) { - %bootloader = read_grub2_install_sh(); - } + my %bootloader = read_grub2_install_sh(); return if is_empty_hash_ref(\%bootloader) & !-s "$::prefix/boot/grub2/grub.cfg"; my %h = getVarsFromSh("$::prefix/etc/default/grub"); $bootloader{timeout} = $h{GRUB_TIMEOUT}; @@ -2148,7 +2145,6 @@ sub install_raw_grub2() { log::explanations("grub2-install failed:\n(" . cat_($f) . ")\nError: <$error>"); die "grub2-install failed: $error"; } - unlink("$::prefix/boot/grub2/drakboot.conf"); } sub install_grub { |