From 058f6d93bec51de178040bfcbaa846ef2b684edb Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 17 Feb 2003 14:44:33 +0000
Subject: propagate /proc/cmdline acpi=xxx

---
 perl-install/install_steps.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install/install_steps.pm')

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})) {
-- 
cgit v1.2.1