summaryrefslogtreecommitdiffstats
path: root/perl-install/bootloader.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-06-17 02:47:45 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-06-17 02:47:45 +0000
commit259d0a6f8b4fac910e5d1a44a288786ce077ef32 (patch)
tree184ebc944313149fa95d76af6cc30e96355111fd /perl-install/bootloader.pm
parent71c62f751756d0fbd8c22820aac20a25ccd05e2c (diff)
downloaddrakx-259d0a6f8b4fac910e5d1a44a288786ce077ef32.tar
drakx-259d0a6f8b4fac910e5d1a44a288786ce077ef32.tar.gz
drakx-259d0a6f8b4fac910e5d1a44a288786ce077ef32.tar.bz2
drakx-259d0a6f8b4fac910e5d1a44a288786ce077ef32.tar.xz
drakx-259d0a6f8b4fac910e5d1a44a288786ce077ef32.zip
(read_grub) fix reading config with new grub (thus fixing detectloader, thus
fixing bootloader-config, thus fixing installkernel)
Diffstat (limited to 'perl-install/bootloader.pm')
-rw-r--r--perl-install/bootloader.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 9b1157ba9..012921026 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -230,7 +230,11 @@ sub read_grub {
}
}
foreach (cat_("$::prefix/boot/grub/install.sh")) {
- $b{boot} = grub2dev($1, $grub2dev) if /\s+d\s+(\(.*?\))/;
+ if (/\s+d\s+(\(.*?\))/) {
+ $b{boot} = grub2dev($1, $grub2dev);
+ } elsif (/^setup\s+(\(.*?\))/) {
+ $b{boot} = grub2dev($1, $grub2dev);
+ }
}
#- sanitize