diff options
author | Dirk von Suchodoletz | 2009-06-20 17:41:26 +0200 |
---|---|---|
committer | Dirk von Suchodoletz | 2009-06-20 17:41:26 +0200 |
commit | f5edc3be1c298323cc9b464cac4dc868e43bf29c (patch) | |
tree | 696ed57d9b751f7dd836eeece7df6082bdd47878 /boot-env | |
parent | very bad bug detected ;-( and eliminated ... I guess that's what trunk is for (diff) | |
download | core-f5edc3be1c298323cc9b464cac4dc868e43bf29c.tar.gz core-f5edc3be1c298323cc9b464cac4dc868e43bf29c.tar.xz core-f5edc3be1c298323cc9b464cac4dc868e43bf29c.zip |
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
Diffstat (limited to 'boot-env')
-rw-r--r-- | boot-env/OpenSLX/MakeInitRamFS/Distro/Debian.pm | 2 | ||||
-rw-r--r-- | boot-env/OpenSLX/MakeInitRamFS/Distro/Scilin.pm | 2 | ||||
-rw-r--r-- | boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm | 2 | ||||
-rw-r--r-- | boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm | 2 | ||||
-rw-r--r-- | boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm | 2 | ||||
-rwxr-xr-x | boot-env/preboot/uclib-rootfs/init | 3 |
6 files changed, 7 insertions, 6 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 |