summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-03-31 15:20:05 +0000
committerFrancois Pons <fpons@mandriva.com>2003-03-31 15:20:05 +0000
commitd9396fe9912a2ca64b89131e4354ccbca615467b (patch)
tree48d2c4c4a7b53247d32186db2f5cd38a573c17f5
parent50b13f6b562e220b3813c94df876333eba972d08 (diff)
downloaddrakx-d9396fe9912a2ca64b89131e4354ccbca615467b.tar
drakx-d9396fe9912a2ca64b89131e4354ccbca615467b.tar.gz
drakx-d9396fe9912a2ca64b89131e4354ccbca615467b.tar.bz2
drakx-d9396fe9912a2ca64b89131e4354ccbca615467b.tar.xz
drakx-d9396fe9912a2ca64b89131e4354ccbca615467b.zip
fixed regex for kernel options retrieved for restore bootloader entry.
-rw-r--r--perl-install/bootloader.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index a6da7eb07..f82dcc3c2 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -500,7 +500,7 @@ wait %d seconds for default boot.
#- add a restore entry if installation is done from disk, in order to allow redoing it.
if (my $hd_install_path = any::hdInstallPath()) {
if (-e "/tmp/image/boot/vmlinuz" && -e "/tmp/image/boot/all.rdz" and
- my ($cmdline) = cat_("/tmp/image/boot/grub/menu.lst") =~ /kernel \S+\/boot\/vmlinuz (.*)$/) {
+ my ($cmdline) = cat_("/tmp/image/boot/grub/menu.lst") =~ /kernel \S+\/boot\/vmlinuz (.*)$/m) {
log::l("adding a restore bootloader entry on $hd_install_path");
add_entry($bootloader, {
type => 'image',