no_comment

6 files changed, 16 insertions, 12 deletions

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index f12da5e86..0c07c9994 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -191,7 +191,7 @@ sub mount($$$;$) {
     } elsif ($fs eq 'smb') {
 	die "no smb yet...";
     } else {
-	$dev = devices::make($dev) if $fs ne 'proc';
+	$dev = devices::make($dev) if $fs ne 'proc' && $fs ne 'usbdevfs';
 
 	my $flag = c::MS_MGC_VAL();
 	$flag |= c::MS_RDONLY() if $rdonly;
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 15f66bcff..5434ddc8c 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -346,6 +346,7 @@ sub installPackages {
 #------------------------------------------------------------------------------
 sub miscellaneous {
     $::live and return;
+    $o->miscellaneousBefore($_[0]);
     $o->miscellaneous($_[0]);
 
     addToBeDone {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 8cde0e12b..0b4430b42 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -791,9 +791,7 @@ sub configureXAfter {
 }
 
 #------------------------------------------------------------------------------
-# miscellaneousNetwork moved to any
-#------------------------------------------------------------------------------
-sub miscellaneous {
+sub miscellaneousBefore {
     my ($o) = @_;
 
     my %s = getVarsFromSh("$o->{prefix}/etc/sysconfig/system");
@@ -806,6 +804,9 @@ sub miscellaneous {
 
     cat_("/proc/cmdline") =~ /.mem=(\S+)/; #- if /^mem/, it means that's the value grub gave
     add2hash_($o->{miscellaneous} ||= {}, { numlock => !$o->{pcmcia}, $1 ? (memsize => $1) : () });
+}
+sub miscellaneous {
+    my ($o) = @_;
 
     local $_ = $o->{bootloader}{perImageAppend};
     if (my $ramsize = $o->{miscellaneous}{memsize} and !/mem=/) {
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d28fea76d..94e01d188 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -790,7 +790,6 @@ sub miscellaneous {
     );
     delete @l{0,1,5} unless $::expert;
 
-    install_steps::miscellaneous($o);
     my $u = $o->{miscellaneous} ||= {};
     exists $u->{LAPTOP} or $u->{LAPTOP} = 1;
     my $s = $o->{security};
@@ -804,7 +803,7 @@ sub miscellaneous {
 	_("Miscellaneous questions"), [
 _("Use hard drive optimisations?") => { val => \$u->{HDPARM}, type => 'bool', text => _("(may cause data corruption)") },
 _("Choose security level") => { val => \$s, list => [ map { $l{$_} } ikeys %l ] },
-_("Precise RAM size if needed (found %d MB)", availableRam / 1024 + 3) => \$u->{memsize}, #- add three for correction.
+_("Precise RAM size if needed (found %d MB)", availableRam / 1024 + 1) => \$u->{memsize}, #- add three for correction.
 arch() !~ /^sparc/ ? (
 _("Removable media automounting") => { val => \$o->{useSupermount}, type => 'bool', text => 'supermount' }, ) : (),
      $::expert ? (
@@ -829,6 +828,8 @@ _("Be carefull, having numlock enabled causes a lot of keystrokes to
 give digits instead of normal letters (eg: pressing `p' gives `6')")) || return;
 	    0; }
     ) || return;
+
+    install_steps::miscellaneous($o);
 }
 
 #------------------------------------------------------------------------------
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 218ae85a6..c8e1d78ab 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -290,7 +290,7 @@ sub write {
     $lang or return;
 
     my $h = { RPM_INSTALL_LANG => $ENV{RPM_INSTALL_LANG} };
-    $h{$_} = $lang foreach qw(LC_COLLATE LC_CTYPE LC_MESSAGES LC_NUMERIC LC_MONETARY LC_TIME);
+    $h->{$_} = $lang foreach qw(LC_COLLATE LC_CTYPE LC_MESSAGES LC_NUMERIC LC_MONETARY LC_TIME);
     if (my $l = $languages{$lang}) {
 	add2hash $h, { LANG => $l->[2], LANGUAGE => $l->[3], KDE_LANG => $l->[3], RPM_INSTALL_LANG => $l->[3] };
 
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 7a1e0e203..c7bd31622 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -464,11 +464,12 @@ sub load_raw {
 	    }
 	} elsif ($_->[0] =~ /usb-[uo]hci/) {
 	    add_alias('usb-interface', $_->[0]);
-	    my $d = '/proc/bus/usb';
-	    syscall_('mount', $d, $d, my $t= 'usbdevfs', my $f = c::MS_MGC_VAL(), my $fl = '') or die;
-	    #- ensure keyboard is working, the kernel must do the job the BIOS was doing
-	    sleep 2;
-	    load_multi("usbkbd", "keybdev") if detect_devices::hasUsbKeyboard();
+	    eval {
+		require fs; fs::mount('/proc/bus/usb', '/proc/bus/usb', 'usbdevfs');
+		#- ensure keyboard is working, the kernel must do the job the BIOS was doing
+		sleep 2;
+		load_multi("usbkbd", "keybdev") if detect_devices::hasUsbKeyboard();
+	    }
 	}
     }
 }