summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-17 14:44:33 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-17 14:44:33 +0000
commit058f6d93bec51de178040bfcbaa846ef2b684edb (patch)
treedaed22c83953d7ee660893634708d6d64eec58b4
parent10a315bed8decbc21956f99896437feaaecddc43 (diff)
downloaddrakx-058f6d93bec51de178040bfcbaa846ef2b684edb.tar
drakx-058f6d93bec51de178040bfcbaa846ef2b684edb.tar.gz
drakx-058f6d93bec51de178040bfcbaa846ef2b684edb.tar.bz2
drakx-058f6d93bec51de178040bfcbaa846ef2b684edb.tar.xz
drakx-058f6d93bec51de178040bfcbaa846ef2b684edb.zip
propagate /proc/cmdline acpi=xxx
-rw-r--r--perl-install/install_steps.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index cfb2dbc71..cf68ac593 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -829,7 +829,9 @@ sub setupBootloaderBefore {
if (cat_("/proc/cmdline") =~ /\b(pci)=(\S+)/) {
bootloader::add_append($o->{bootloader}, $1, $2);
}
- bootloader::add_append($o->{bootloader}, acpi => (cat_("/proc/cmdline") =~ /\bacpi=(\S+)/ ? $1 : 'off'));
+ if (my ($acpi) = cat_("/proc/cmdline") =~ /\bacpi=(\S+)/) {
+ bootloader::add_append($o->{bootloader}, acpi => $acpi);
+ }
if (arch() =~ /alpha/) {
if (my $dev = fsedit::get_root($o->{fstab})) {