Trying to fix the #468 bug ... (hid_bright in Ubuntu 9.NN)

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2978 95ad53e4-c205-0410-b2fa-d234c58c8868

7 files changed, 8 insertions, 7 deletions

diff --git a/boot-env/OpenSLX/MakeInitRamFS/Distro/Debian.pm b/boot-env/OpenSLX/MakeInitRamFS/Distro/Debian.pm
index 017783ee..997b5a08 100644
--- a/boot-env/OpenSLX/MakeInitRamFS/Distro/Debian.pm
+++ b/boot-env/OpenSLX/MakeInitRamFS/Distro/Debian.pm
@@ -37,7 +37,7 @@ sub applyChanges
     my $self   = shift;
     my $engine = shift;
 
-    $engine->_addFilteredKernelModules( qw( af_packet hid unix ));
+    $engine->_addFilteredKernelModules( qw( af_packet hid hid_bright unix ));
 
     return;
 }
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Distro/Scilin.pm b/boot-env/OpenSLX/MakeInitRamFS/Distro/Scilin.pm
index 942aab66..4ffa0886 100644
--- a/boot-env/OpenSLX/MakeInitRamFS/Distro/Scilin.pm
+++ b/boot-env/OpenSLX/MakeInitRamFS/Distro/Scilin.pm
@@ -38,7 +38,7 @@ sub applyChanges
     my $self   = shift;
     my $engine = shift;
     # filter modules which are part of the main kernel already
-    $engine->_addFilteredKernelModules( qw( af_packet hid usbhid unix vesafb fbcon));
+    $engine->_addFilteredKernelModules( qw( af_packet hid usbhid unix vesafb fbcon hid_bright ));
 
     return;
 }
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm b/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm
index b553516a..56f839fd 100644
--- a/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm
+++ b/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm
@@ -37,7 +37,7 @@ sub applyChanges
     my $self   = shift;
     my $engine = shift;
 
-    $engine->_addFilteredKernelModules( qw( hid unix vesafb fbcon));
+    $engine->_addFilteredKernelModules( qw( hid hid_bright unix vesafb fbcon ));
 
     return;
 }
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm b/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
index 7041f688..10efd780 100644
--- a/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
+++ b/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
@@ -38,7 +38,7 @@ sub applyChanges
     my $self   = shift;
     my $engine = shift;
 
-    $engine->_addFilteredKernelModules( qw( unix ));
+    $engine->_addFilteredKernelModules( qw( unix hid_bright ));
 
     return;
 }
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm b/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
index fcc8601a..a5153af1 100644
--- a/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
+++ b/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
@@ -231,7 +231,7 @@ sub _copyKernelModules
     # (some of these modules do not exist on all distros, so they will be
     # filtered out again by the respective distro object):
     my @kernelModules = qw(
-        af_packet unix hid usbhid uhci-hcd ohci-hcd vesafb fbcon
+        af_packet unix hid hid_bright usbhid uhci-hcd ohci-hcd vesafb fbcon
     );
     push @kernelModules, @{ $self->{'suggested-kernel-modules'} };
 
diff --git a/boot-env/preboot/uclib-rootfs/init b/boot-env/preboot/uclib-rootfs/init
index ed2c22ae..92882f79 100755
--- a/boot-env/preboot/uclib-rootfs/init
+++ b/boot-env/preboot/uclib-rootfs/init
@@ -91,7 +91,8 @@ done
 dialog --infobox "Starting OpenSLX preboot environment ..." 3 65
 
 # load usb keyboard and network adaptor modules
-for mod in ${ramfs_nicmods} af_packet unix hid usbhid uhci-hcd ohci-hcd ; do
+for mod in ${ramfs_nicmods} af_packet unix hid hid_bright usbhid \
+                            uhci-hcd ohci-hcd ; do
   if [ x != x$(find /lib/modules -name ${mod}.ko) ]; then
     modprobe $mod || \
       dialog --infobox "Module $mod did not load for some reason." 3 65
diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg
index 55d3ff12..5a66af62 100755
--- a/initramfs/stage3-stuff/bin/hwautocfg
+++ b/initramfs/stage3-stuff/bin/hwautocfg
@@ -27,7 +27,7 @@ done
 # no kernel messages, switch on hotplug via /sbin/mdev
 echo "0 0 0 0" >/proc/sys/kernel/printk
 echo "/sbin/mdev" >/proc/sys/kernel/hotplug
-modprobe ${MODPRV} usbhid &
+modprobe -a ${MODPRV} usbhid hid_bright &
 nwcardlist=$(echo ${slxconf_listnwmod}|sed "s/\ /|/g")
 hwinfo --netcard --usb-ctrl | grep modprobe | grep -E "$nwcardlist|hcd" | \
   grep -v ehci | sed 's/.* Cmd: "//;s/"//' | sort -u >/etc/modprobe.base