diff options
| author | Dirk von Suchodoletz | 2006-02-04 03:04:17 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-02-04 03:04:17 +0100 |
| commit | fb28eba71ac2846658c25477890c493ce550ff3d (patch) | |
| tree | 709f77ce492e2519617f2634f15d6d428b1dc359 /initrd/initrd-stuff/bin/hwautocfg | |
| parent | Improvements in hwautocfg (checked against lots of machines), nscd (diff) | |
| download | core-fb28eba71ac2846658c25477890c493ce550ff3d.tar.gz core-fb28eba71ac2846658c25477890c493ce550ff3d.tar.xz core-fb28eba71ac2846658c25477890c493ce550ff3d.zip | |
Introduced nbd to initial ramdisk (as alternative to NFS). Works mostly
(bug within NBD ...) Optimized hwautocfg ...
git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@59 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/bin/hwautocfg')
| -rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg index 7bd7b7b5..660f201c 100755 --- a/initrd/initrd-stuff/bin/hwautocfg +++ b/initrd/initrd-stuff/bin/hwautocfg @@ -336,8 +336,12 @@ for DRIVER in ohci-hcd uhci-hcd ehci-hcd ohci1394; do modprobe ${MODPRV} ${DRIVER} DRIVERLIST="${DRIVERLIST} ${DRIVER}"; } done -# remove usb core if USB not present -[ -z "$USB" ] && rmmod usbcore +# load usbhid (for USB keyboard/mouse) or remove usbcore module if USB +# not present +if [ -n "$USB" ] ; then + modprobe ${MODPRV} usbhid & +else rmmod usbcore +fi # remove unneeded network card modules for DRIVER in ${NWMODULES}; do strinfile " ${DRIVER}" /tmp/hwsetup.info || { @@ -380,14 +384,12 @@ done # is initialized test -f /proc/bus/usb/devices || mount -n -t usbfs usbfs /proc/bus/usb usleep 10 && hwsetup -v > /tmp/hwsetup.info -# check if USB mouse and/or keyboard is connected -if strinfile "genericwheelusb" /tmp/hwsetup.info ; then - modprobe ${MODPRV} usbhid -elif strinfile "keybdev" /tmp/hwsetup.info ; then - modprobe ${MODPRV} usbhid -fi +# check if USB mouse and/or keyboard is connected and remove usbhid if +# not +strinfile "genericwheelusb" /tmp/hwsetup.info || \ + strinfile "keybdev" /tmp/hwsetup.info || rmmod usbhid -# fixme - usb keyboard?? +# load IDE high level drivers if [ -n "$IDE" ] ; then # you might want to check /etc/sysconfig/floppy for more info strinfile "ZIP" /tmp/hwsetup.info && modprobe ${MODPRV} ide_floppy |