diff options
| -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 | 2 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/bin/hwautocfg | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Distro/Debian.pm b/boot-env/OpenSLX/MakeInitRamFS/Distro/Debian.pm index 997b5a08..d0210bad 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 hid_bright 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 4ffa0886..1d27c0ce 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 hid_bright )); + $engine->_addFilteredKernelModules( qw( af_packet hid hid-bright usbhid unix vesafb fbcon )); return; } diff --git a/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm b/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm index 56f839fd..c664c1ba 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 hid_bright 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 10efd780..9240f5b5 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 hid_bright )); + $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 a5153af1..0f1ad35d 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 hid_bright 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 92882f79..f240d65d 100755 --- a/boot-env/preboot/uclib-rootfs/init +++ b/boot-env/preboot/uclib-rootfs/init @@ -91,7 +91,7 @@ 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 hid_bright usbhid \ +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 || \ diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg index 5a66af62..282707f0 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 -a ${MODPRV} usbhid hid_bright & +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 |