diff options
| author | Dirk von Suchodoletz | 2006-06-30 01:27:12 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-06-30 01:27:12 +0200 |
| commit | ac5635ae692d39c7fe837155651049d432c93333 (patch) | |
| tree | c3d34fbbc5f219fb8110d75595628e9e8bcbfbe3 /initrd/initrd-stuff/bin/hwautocfg | |
| parent | bootsplash bugfix (diff) | |
| download | core-ac5635ae692d39c7fe837155651049d432c93333.tar.gz core-ac5635ae692d39c7fe837155651049d432c93333.tar.xz core-ac5635ae692d39c7fe837155651049d432c93333.zip | |
Initial support for busybox, update of hwsetup and hw configuration data
...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@262 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/bin/hwautocfg')
| -rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg index c6fbf5d7..bc087964 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>, 26-06-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 29-06-2006 # Felix Endres # # Copyright: (c) 2003 - 2006 - RZ Universitaet Freiburg @@ -90,6 +90,7 @@ local ServerLayout='\tIdentifier\t"Simple Layout"\n local DRI='\tGroup\t\t"video"\n \tMode\t\t0666' +# displayvars may overwrite the above settings displayvars if [ -n "$hw_graphic" ] ; then @@ -395,7 +396,8 @@ fi # not rather precise ... if strinfile "SCSI" /tmp/hwsetup.info ; then - strinfile "CDROM" /tmp/hwsetup.info && modprobe -a ${MODPRV} sr_mod sg + strinfile "CDROM" /tmp/hwsetup.info && { modprobe ${MODPRV} sr_mod; + modprobe ${MODPRV} sg; } strinfile "HD" /tmp/hwsetup.info && modprobe ${MODPRV} sd_mod fi # fixme - psmouse entladen, falls nicht vorhanden |