diff options
| author | Dirk von Suchodoletz | 2006-02-03 20:52:42 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-02-03 20:52:42 +0100 |
| commit | 6d17fdc7f0e548131acf803d93e890f8124ccc58 (patch) | |
| tree | 09d336930c3ec94ea055d6ed0842893ecd6feae5 /initrd/initrd-stuff/bin | |
| parent | und noch der eigentliche commit... (diff) | |
| download | core-6d17fdc7f0e548131acf803d93e890f8124ccc58.tar.gz core-6d17fdc7f0e548131acf803d93e890f8124ccc58.tar.xz core-6d17fdc7f0e548131acf803d93e890f8124ccc58.zip | |
Fixed bug in mkdxsinitrd - if link of a binary is copied you get the
binary from the server instead of client root - problem on different
architectures. Some minor bugfixes in other files ...
git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@57 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/bin')
| -rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg index 35af9f10..eba4e91f 100755 --- a/initrd/initrd-stuff/bin/hwautocfg +++ b/initrd/initrd-stuff/bin/hwautocfg @@ -4,7 +4,7 @@ # script for linux diskless clients, using hwconfig from # knoppix as base tool # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 31-01-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 03-02-2006 # Blabla # Blub # @@ -351,7 +351,10 @@ for DRIVER in ${NWMODULES}; do DRIVERLIST="${DRIVERLIST} ${DRIVER}"; } done # sound card setup (alsa and oss compatibility drivers) -. /etc/sysconfig/sound || DRIVER="snd-dummy" +if [ -f /etc/sysconfig/sound ] ; then + . /etc/sysconfig/sound +else DRIVER="snd-dummy" +fi modprobe ${MODPRV} ${DRIVER} DRIVERLIST="${DRIVERLIST} ${DRIVER} " modprobe -a ${MODPRV} snd_pcm_oss snd_mixer_oss @@ -386,6 +389,7 @@ done strinfile "genericwheelusb" /tmp/hwsetup.info && modprobe ${MODPRV} usbhid # fixme - usb keyboard?? if [ -n "$IDE" ] ; then + strinfile " ZIP " /tmp/hwsetup.info && modprobe ${MODPRV} ide_floppy strinfile "CDROM" /tmp/hwsetup.info && modprobe ${MODPRV} ide_cd strinfile "HD" /tmp/hwsetup.info && modprobe ${MODPRV} ide_disk & fi |