summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2004-08-25 05:21:51 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2004-08-25 05:21:51 +0000
commita8e02eb1639876f9f60f3f2031b774eee59fd02f (patch)
treedc570698b4e2f4275af86e4bc16badcff2225373
parent47cc785931f3be0d7c449ac0d5eb2f7719378178 (diff)
downloaddrakx-backup-do-not-use-a8e02eb1639876f9f60f3f2031b774eee59fd02f.tar
drakx-backup-do-not-use-a8e02eb1639876f9f60f3f2031b774eee59fd02f.tar.gz
drakx-backup-do-not-use-a8e02eb1639876f9f60f3f2031b774eee59fd02f.tar.bz2
drakx-backup-do-not-use-a8e02eb1639876f9f60f3f2031b774eee59fd02f.tar.xz
drakx-backup-do-not-use-a8e02eb1639876f9f60f3f2031b774eee59fd02f.zip
handle nolapic, idle=poll, ide=nodma boot options
-rw-r--r--perl-install/install_steps.pm9
1 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 832b37a53..f6fc97b2f 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -808,6 +808,15 @@ sub setupBootloaderBefore {
if (cat_("/proc/cmdline") =~ /\bnoapic/) {
bootloader::set_append($o->{bootloader}, 'noapic');
}
+ if (cat_("/proc/cmdline") =~ /\bnolapic/) {
+ bootloader::set_append($o->{bootloader}, 'nolapic');
+ }
+ if (cat_("/proc/cmdline") =~ /\b(idle)=(\S+)/) {
+ bootloader::set_append($o->{bootloader}, $1, $2);
+ }
+ if (cat_("/proc/cmdline") =~ /ide=nodma/) {
+ bootloader::set_append($o->{bootloader}, 'ide', 'nodma');
+ }
my ($MemTotal) = cat_("/proc/meminfo") =~ /^MemTotal:\s*(\d+)/m;
if (my ($biggest_swap) = sort { $b->{size} <=> $a->{size} } grep { isSwap($_) } @{$o->{fstab}}) {
log::l("MemTotal: $MemTotal < ", $biggest_swap->{size} / 2);