This commit was manufactured by cvs2svn to create tagV10_34_11_100mdk

'V10_34_11_100mdk'.

1 files changed, 19 insertions, 5 deletions

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 2c779e9b4..c665a5479 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -287,6 +287,8 @@ sub setPackages {
     $rebuild_needed and pkgs::selectPackagesToUpgrade($o->{packages}, $o->{prefix});
 }
 
+sub selectSupplMedia { '' }
+
 sub choosePackages {
     my ($o, $packages, $_compssUsers, $first_time) = @_;
 
@@ -560,11 +562,12 @@ sub updateModulesFromFloppy {
 	    my @dest_files = map { chomp_($_) } run_program::rooted_get_stdout($o->{prefix}, 'find', '/lib/modules');
 	    foreach my $s (@src_files) {
 		log::l("found updatable module $s");
-		my ($sfile, $sext) = $s =~ m!([^/\.]*\.k?o)(?:\.gz|\.bz2)?$!;
+		my ($sfile, $sext) = $s =~ m!([^/\.]*\.k?o)(\.gz|\.bz2)?$!;
 		my $qsfile = quotemeta $sfile;
 		my $qsext = quotemeta $sext;
 		foreach my $target (@dest_files) {
 		    $target =~ /$qsfile/ or next;
+		    $target = "$o->{prefix}/$target";
 		    eval { cp_af($s, $target) };
 		    if ($@) {
 			log::l("updating module $target by $s failed: $@");
@@ -630,7 +633,7 @@ sub summaryBefore {}
 sub summary {
     my ($o) = @_;
     configureTimezone($o);
-    configurePrinter($o) if $o->{printer};
+    configurePrinter($o) if $o->{printer} && $o->{printer}{SPOOLER};
 }
 
 sub summaryAfter {
@@ -808,6 +811,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);
@@ -868,7 +880,7 @@ sub configureX {
     $o->{raw_X} = Xconfig::default::configure($o->{keyboard}, $o->{mouse});
 
     require Xconfig::main;
-    Xconfig::main::configure_everything_auto_install($o->{raw_X}, $o->do_pkgs, $o->{X}, { allowFB => $o->{allowFB} });
+    Xconfig::main::configure_everything_auto_install($o->{raw_X}, $o->do_pkgs, $o->{X}, install_any::X_options_from_o($o));
     configureXAfter($o);
 }
 sub configureXAfter {
@@ -913,11 +925,13 @@ sub miscellaneousAfter {
     $ENV{SECURE_LEVEL} = $o->{security}; #- deprecated with chkconfig 1.3.4-2mdk, uses /etc/sysconfig/msec
 
     addToBeDone {
-	setVarsInSh("$o->{prefix}/etc/sysconfig/system", { 
+	my %l = ( 
             CLASS => $::expert && 'expert' || 'beginner',
             SECURITY => $o->{security},
 	    META_CLASS => $o->{meta_class} || 'PowerPack',
-        });
+        );
+	$l{SYSTEM} = 'Corporate' if $::corporate;
+	setVarsInSh("$o->{prefix}/etc/sysconfig/system", \%l);
 	substInFile { s/KEYBOARD_AT_BOOT=.*/KEYBOARD_AT_BOOT=yes/ } "$o->{prefix}/etc/sysconfig/usb" if detect_devices::usbKeyboards();
 
     } 'installPackages';