From ed535ad3110069a7578def069d69b7da545b9542 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Mon, 3 Nov 2003 15:58:05 +0000
Subject: woops, when_load already exists :)

---
 perl-install/modules.pm | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 712da0164..5be4cbfa0 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -62,7 +62,6 @@ sub load {
     } else {
 	load_raw(map { [ $_ => $options{$_} ] } @l);
     }
-    post_load(@l);
     sleep 2 if any { /^(usb-storage|mousedev|printer)$/ } @l;
 
     if ($network_module) {
@@ -357,6 +356,15 @@ sub read_already_loaded() {
 sub when_load {
     my ($name, @options) = @_;
 
+    if ($name =~ /usb-[uo]hci/) {
+        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 4;
+            load("usbkbd", "keybdev") if detect_devices::usbKeyboards();
+        }
+    }
+
     load('snd-pcm-oss') if $name =~ /^snd-/;
     add_alias('ieee1394-controller', $name) if member($name, 'ohci1394');
     add_probeall('usb-interface', $name) if $name =~ /usb-[uo]hci/ || $name eq 'ehci-hcd';
@@ -410,19 +418,6 @@ sub load_raw {
 
 }
 
-sub post_load {
-    my @modules = @_;
-
-    if (any { /usb-[uo]hci/ } @modules) {
-        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 4;
-            load("usbkbd", "keybdev") if detect_devices::usbKeyboards();
-        }
-    }
-}
-
 sub get_parameters {
     map { if_(/(.*)=(.*)/, $1 => $2) } split(' ', get_options($_[0]));
 }
-- 
cgit v1.2.1