summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-09-09 03:28:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-09-09 03:28:56 +0000
commit73774bc4456089e4f54df0fcd79bc6b99c6f2f1e (patch)
tree3d300395b379b5dd208334d307bb73093745c68f
parent4fa0259fe6754f62eca733d0fb1c234675d158aa (diff)
downloaddrakx-73774bc4456089e4f54df0fcd79bc6b99c6f2f1e.tar
drakx-73774bc4456089e4f54df0fcd79bc6b99c6f2f1e.tar.gz
drakx-73774bc4456089e4f54df0fcd79bc6b99c6f2f1e.tar.bz2
drakx-73774bc4456089e4f54df0fcd79bc6b99c6f2f1e.tar.xz
drakx-73774bc4456089e4f54df0fcd79bc6b99c6f2f1e.zip
- handle lilo "static-bios-codes" option
- call lilo with a forced stdin (so that it doesn't read from tty) - enable calling lilo with a special stdin value
-rw-r--r--perl-install/bootloader.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 6b7446770..c98f61b10 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -993,7 +993,7 @@ sub write_lilo {
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 { "$_=$bootloader->{$_}" } grep { $bootloader->{$_} } qw(boot map install vga keytable);
- push @conf, grep { $bootloader->{$_} } qw(linear geometric compact prompt nowarn restricted);
+ push @conf, grep { $bootloader->{$_} } qw(linear geometric compact prompt nowarn restricted static-bios-codes);
push @conf, qq(append="$bootloader->{append}") if $bootloader->{append};
push @conf, "password=" . $bootloader->{password} if $bootloader->{password}; #- also done by msec
push @conf, "timeout=" . round(10 * $bootloader->{timeout}) if $bootloader->{timeout};
@@ -1065,7 +1065,8 @@ sub when_config_changed_lilo {
if (!$::testing && arch() !~ /ia64/ && $bootloader->{method} =~ /lilo/) {
log::l("Installing boot loader on $bootloader->{boot}...");
my $error;
- run_program::rooted($::prefix, "lilo", "2>", \$error) or die "lilo failed: $error";
+ my $answer = $bootloader->{force_lilo_answer} || '';
+ my $ok = run_program::rooted($::prefix, "echo $answer | lilo", '2>', \$error) or die "lilo failed: $error";
}
}