diff options
| author | Nico Dietrich | 2006-02-17 01:35:31 +0100 |
|---|---|---|
| committer | Nico Dietrich | 2006-02-17 01:35:31 +0100 |
| commit | 6b768f803fc8bf786f6a1ad397d22c9c8001d9f6 (patch) | |
| tree | fe1a2827dec6e9173bf096ec013d97e9e23a1f3e /initrd/initrd-stuff/bin | |
| parent | postinit function added (e.g. for running udevstart again) (diff) | |
| download | core-6b768f803fc8bf786f6a1ad397d22c9c8001d9f6.tar.gz core-6b768f803fc8bf786f6a1ad397d22c9c8001d9f6.tar.xz core-6b768f803fc8bf786f6a1ad397d22c9c8001d9f6.zip | |
fixes: dhclient in ubuntu, ide-generic
git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@79 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/bin')
| -rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg index 29cf98b8..772b658d 100755 --- a/initrd/initrd-stuff/bin/hwautocfg +++ b/initrd/initrd-stuff/bin/hwautocfg @@ -284,7 +284,7 @@ modprobe ${MODPRV} usbcore & modprobe ${MODPRV} mousedev # start the knoppix hardware autodetection tool -( hwsetup -v > /tmp/hwsetup.info && echo "hwsetup" > /tmp/hwrun1 ) & +( hwsetup -v > /tmp/hwsetup.info && echo "hwsetup" > /tmp/hwrun1 ) & # ACPI configuration - at least not needed with SuSE 9.3/10.0 #if [ -d /proc/acpi ]; then @@ -311,11 +311,10 @@ waitfor /tmp/hwrun1 50000 || \ error " Expected information from hwsetup to appear in \ /tmp/hwsetup.info.\n Unable to configure parts of the systems hardware. \ Please check that\n hwsetup is properly installed and executable." - # "drivers" (pseudo, placeholder strings, ...) to exclude from loading DRIVERLIST=" disabled unknown ignore pcspkr synaptics keybdev" # driver blacklist (real modules which fail to load) -DRIVERLIST=${DRIVERLIST}" hw_random ichxrom" +DRIVERLIST=${DRIVERLIST}" hw_random ichxrom kanotix genericwheelusb " # load ide drivers first, takes a while to initialize for DRIVER in cmd64x hpt366 piix slc90e66 cs5520 it821x rz1000 \ triflex aec62xx cs5530 ns87415 sc1200 trm290 alim15x3 \ @@ -358,6 +357,7 @@ if [ -f /etc/sysconfig/sound ] ; then else DRIVER="snd-dummy" fi modprobe ${MODPRV} ${DRIVER} + DRIVERLIST="${DRIVERLIST} ${DRIVER} " modprobe -a ${MODPRV} snd_pcm_oss snd_mixer_oss # check for PCMCIA / cardbus stuff @@ -387,11 +387,12 @@ done # like dvd or harddisk - wait a few seconds so hopefully the ide driver # is initialized test -f /proc/bus/usb/devices || mount -n -t usbfs usbfs /proc/bus/usb +[ -n "$IDE" ] && modprobe -q ide_generic 2>/dev/null usleep 10 && hwsetup -v > /tmp/hwsetup.info # 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 + (strinfile "keybdev" /tmp/hwsetup.info || rmmod usbhid) # load IDE high level drivers if [ -n "$IDE" ] ; then @@ -400,6 +401,7 @@ if [ -n "$IDE" ] ; then strinfile "CDROM" /tmp/hwsetup.info && modprobe ${MODPRV} ide_cd strinfile "HD" /tmp/hwsetup.info && modprobe ${MODPRV} ide_disk & fi + # not rather precise ... if strinfile "SCSI" /tmp/hwsetup.info ; then strinfile "CDROM" /tmp/hwsetup.info && modprobe -a ${MODPRV} sr_mod sg @@ -438,4 +440,3 @@ configuration file generated by hwsetup could not\n be found." nonfatal displaysetup ${D_XF86CONFFILE} echo "finished" > /tmp/hwcfg - |