diff options
author | Dirk von Suchodoletz | 2006-01-30 01:40:58 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2006-01-30 01:40:58 +0100 |
commit | 4be1c86e1fecbe9b7f3bce3e674d4d0f80d0dea6 (patch) | |
tree | dc9db434509ce355adf85fd10e7216f8b3ee4606 /initrd/initrd-stuff/bin/hwautocfg | |
parent | Added simple automounter functionality for user homes. See servconfig, (diff) | |
download | core-4be1c86e1fecbe9b7f3bce3e674d4d0f80d0dea6.tar.gz core-4be1c86e1fecbe9b7f3bce3e674d4d0f80d0dea6.tar.xz core-4be1c86e1fecbe9b7f3bce3e674d4d0f80d0dea6.zip |
Some minor bugfixes and cleanups ...
git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@48 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/bin/hwautocfg')
-rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg index 4ba7998a..4618eeea 100755 --- a/initrd/initrd-stuff/bin/hwautocfg +++ b/initrd/initrd-stuff/bin/hwautocfg @@ -4,17 +4,14 @@ # script for linux diskless clients, using hwconfig from # knoppix as base tool # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 29-01-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 30-01-2006 # Blabla # Blub # # Copyright: (c) 2003 - 2006 - RZ Universitaet Freiburg # -# -# - -# local functions +# local functions used within hwautocfg displaysetup () { local xfc=$1 # define some defaults @@ -277,15 +274,15 @@ fi # USB core is needed for presence of /proc/bus/usb ( modprobe ${MODPRV} usbcore && mount -n -t usbfs usbfs /proc/bus/usb ) & -#fixmee: Kernelmodul für ps-maeuse laden, da sie sonst nicht von hwsetup erkannt werden. -if [ -f /mnt/lib/modules/${KERNEL}/kernel/drivers/input/mouse/psmouse.ko ]; then - ( modprobe ${MODPRV} psmouse ) -fi +#fixmee: Kernelmodul für ps-maeuse laden, da sie sonst nicht von hwsetup +# erkannt werden. ( -> /lib reicht, bind mounted!! ) +[ -f /lib/modules/${KERNEL}/kernel/drivers/input/mouse/psmouse.ko ] && \ + modprobe ${MODPRV} psmouse # start the knoppix hardware autodetection tool ( hwsetup -v > /tmp/hwsetup.info && echo "hwsetup" > /tmp/hwrun1 ) & -# ACPI configuration +# ACPI configuration - at least not needed with SuSE 9.3/10.0 #if [ -d /proc/acpi ]; then # if ! strinstr "noacpi" ${KCMDLINE} || \ # ! strinstr "acpi=off" ${KCMDLINE} ; then @@ -374,6 +371,10 @@ if strinfile "IDE" /tmp/hwsetup.info ; then strinfile "HD" /tmp/hwsetup.info && modprobe ${MODPRV} ide_disk & usleep 5 fi ) & +# cdrom/dvd und plattenkonfig. ergaenzen. Module sind hier geladen und +# devices sind klar + +# fixme - psmouse entladen, falls nicht vorhanden # configure some variables from configuration file - wait for dhcp or ldap # confiurator to complete |