diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-08-29 14:05:22 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-08-29 14:05:22 +0000 |
| commit | a90999ed7daa08d9eb92e0b8fa2cc69cfcb4e85b (patch) | |
| tree | a6fbd31ec7755c4a37141bf1a8dca4788d8624ca | |
| parent | 09a2700c494c6604c4d2e586d7e5e5ab0bc6c077 (diff) | |
| download | drakx-a90999ed7daa08d9eb92e0b8fa2cc69cfcb4e85b.tar drakx-a90999ed7daa08d9eb92e0b8fa2cc69cfcb4e85b.tar.gz drakx-a90999ed7daa08d9eb92e0b8fa2cc69cfcb4e85b.tar.bz2 drakx-a90999ed7daa08d9eb92e0b8fa2cc69cfcb4e85b.tar.xz drakx-a90999ed7daa08d9eb92e0b8fa2cc69cfcb4e85b.zip | |
handle parsing of more complicated setup line in install.sh
| -rw-r--r-- | perl-install/bootloader.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index ba29d7896..40ff7af1e 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -231,7 +231,7 @@ sub read_grub { #- 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) { + if (cat_("$::prefix/boot/grub/install.sh") =~ /^(?:setup.*|install\s.*\sd)\s+(\(.*?\))/m) { $b{boot} = grub2dev($1, $grub2dev); } |