summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-07-31 10:33:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-07-31 10:33:41 +0000
commitb2313e63ebedd577d2b44f1d7110cabde5a89a44 (patch)
treefa4e66a782c9d61b16abb6245151d874d3024152
parentfb13c58c512259986a7b96f415d0b29e3250bace (diff)
downloaddrakx-b2313e63ebedd577d2b44f1d7110cabde5a89a44.tar
drakx-b2313e63ebedd577d2b44f1d7110cabde5a89a44.tar.gz
drakx-b2313e63ebedd577d2b44f1d7110cabde5a89a44.tar.bz2
drakx-b2313e63ebedd577d2b44f1d7110cabde5a89a44.tar.xz
drakx-b2313e63ebedd577d2b44f1d7110cabde5a89a44.zip
- bootloader-config: handle vmdefault and vmdisable lilo.conf options (#26456)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootloader.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 712cb2f50..b0cf09ece 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- bootloader-config: handle vmdefault and vmdisable lilo.conf options (#26456)
- diskdrake: drop "Rescue partition table" feature
(was based on rescuept which has been dropped in util-linux, but was quite
bad compared to testdisk anyway)
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 366a48f74..12fea67a7 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1287,7 +1287,7 @@ sub write_lilo {
push @conf, "# File generated by DrakX/drakboot";
push @conf, "# WARNING: do not forget to run lilo after modifying this file\n";
push @conf, "default=" . make_label_lilo_compatible($bootloader->{default}) if $bootloader->{default};
- push @conf, map { $_ . '=' . $quotes_if_needed->($bootloader->{$_}) } grep { $bootloader->{$_} } qw(boot root map install serial vga keytable raid-extra-boot menu-scheme);
+ push @conf, map { $_ . '=' . $quotes_if_needed->($bootloader->{$_}) } grep { $bootloader->{$_} } qw(boot root map install serial vga keytable raid-extra-boot menu-scheme vmdefault);
push @conf, grep { $bootloader->{$_} } qw(linear geometric compact prompt nowarn restricted static-bios-codes);
push @conf, "append=" . $quotes->($bootloader->{append}) if $bootloader->{append};
push @conf, "password=" . $bootloader->{password} if $bootloader->{password}; #- also done by msec
@@ -1339,7 +1339,7 @@ sub write_lilo {
}
}
push @entry_conf, "password=$entry->{password}" if $entry->{password};
- push @entry_conf, "restricted" if $entry->{restricted};
+ push @entry_conf, grep { $entry->{$_} } qw(restricted vmwarn vmdisable);
push @conf, map { "\t$_" } @entry_conf;
}