summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-06-17 02:57:05 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-06-17 02:57:05 +0000
commit77fd9b04561c033816dd35666aef997547752025 (patch)
tree70dd411b6ad983622022c859032997545ebfc0a2
parent259d0a6f8b4fac910e5d1a44a288786ce077ef32 (diff)
downloaddrakx-77fd9b04561c033816dd35666aef997547752025.tar
drakx-77fd9b04561c033816dd35666aef997547752025.tar.gz
drakx-77fd9b04561c033816dd35666aef997547752025.tar.bz2
drakx-77fd9b04561c033816dd35666aef997547752025.tar.xz
drakx-77fd9b04561c033816dd35666aef997547752025.zip
rewrite and document
-rw-r--r--perl-install/bootloader.pm11
1 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 012921026..67ab14c00 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -229,12 +229,11 @@ sub read_grub {
}
}
}
- foreach (cat_("$::prefix/boot/grub/install.sh")) {
- if (/\s+d\s+(\(.*?\))/) {
- $b{boot} = grub2dev($1, $grub2dev);
- } elsif (/^setup\s+(\(.*?\))/) {
- $b{boot} = grub2dev($1, $grub2dev);
- }
+ #- matches either:
+ #- setup (hd0)
+ #- install (hd0,0)/boot/grub/stage1 d (hd0) (hd0,0)/boot/grub/stage2 p (hd0,0)/boot/grub/menu.lst
+ if (cat_("$::prefix/boot/grub/install.sh") =~ /^(?:setup|install\s+(?:\S+)(?:\s+d)?)\s+(\(.*?\))/m) {
+ $b{boot} = grub2dev($1, $grub2dev);
}
#- sanitize