- fix reading previous keyboard config on upgrade (for displaying in summary)

- ensure keyboard and mouse configuration are not overwritten if not explictly modified on upgrade
- propagate pci=xxx at install to bootloader (since "pci=bios,biosirq" is needed on some box, see http://islay.dyndns.org/taz/index.html for more)

1 files changed, 5 insertions, 2 deletions

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index d1129efc1..e6d2991fc 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -117,7 +117,7 @@ sub selectKeyboard {
 
     addToBeDone {
 	keyboard::write($o->{keyboard});
-    } 'installPackages' unless $::g_auto_install;
+    } 'installPackages' if !$::g_auto_install && (!$o->{isUpgrade} || !$o->{keyboard}{unsafe});
 }
 #------------------------------------------------------------------------------
 sub acceptLicence {}
@@ -813,9 +813,12 @@ sub setupBootloaderBefore {
     if ($o->{miscellaneous}{HDPARM}) {
 	bootloader::add_append($o->{bootloader}, $_, 'autotune') foreach grep { /ide.*/ } all("/proc/ide");
     }
-    if (grep { /mem=nopentium/ } cat_("/proc/cmdline")) {
+    if (cat_("/proc/cmdline") =~ /mem=nopentium/) {
 	bootloader::add_append($o->{bootloader}, 'mem', 'nopentium');
     }
+    if (cat_("/proc/cmdline") =~ /\b(pci)=(\S+)/) {
+	bootloader::add_append($o->{bootloader}, $1, $2);
+    }
 
     if (arch() =~ /alpha/) {
 	if (my $dev = fsedit::get_root($o->{fstab})) {