diff options
Diffstat (limited to 'initrd/initrd-stuff/bin/hwautocfg')
| -rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg index fd1ab828..8fed0677 100755 --- a/initrd/initrd-stuff/bin/hwautocfg +++ b/initrd/initrd-stuff/bin/hwautocfg @@ -4,13 +4,12 @@ # script for linux diskless clients, using hwconfig from # knoppix as base tool # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 24-03-2006 -# Blabla -# Blub +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 09-04-2006 +# Felix Endres # # Copyright: (c) 2003 - 2006 - RZ Universitaet Freiburg # -# Version: 0.3.1e +# Version: 0.3.2a # local functions used within hwautocfg displaysetup () { @@ -118,8 +117,9 @@ systems color depth failed.\n $msg" nonfatal fi #OPTIMIZEME: Optimiere den dreifachen aufruf von Screenres -VERTSR=`screenres | sed -n '/Vertical Frequency Range/s/[^0-9]* \([0-9-]*\)/\1/p'` -HORISR=`screenres | sed -n '/Horizontal Frequency Range/s/[^0-9]* \([0-9-]*\)/\1/p'` +screenres > /tmp/screenres +VERTSR=`cat /tmp/screenres | sed -n '/Vertical Frequency Range/s/[^0-9]* \([0-9-]*\)/\1/p'` +HORISR=`cat /tmp/screenres | sed -n '/Horizontal Frequency Range/s/[^0-9]* \([0-9-]*\)/\1/p'` if [ -n "$HORISR" ]; then HS=$HORISR fi @@ -158,12 +158,8 @@ established." nonfatal fi monmanual=yes -## compute max resolution -#for res in 640x400 640x480 800x600 1024x768 1280x1024 1400x1050 1600x1200 -# do MODES="\"$res\" \"lcd$res\" $MODES" -# [ "$res" = "$MR" ] && break -#done -MODES=`screenres | sed -n '/Recommended Screen Modes:/s/[^"]*\(.*\)/\1/p'` +# compute max resolution +MODES=`cat /tmp/screenres | sed -n '/Recommended Screen Modes:/s/[^"]*\(.*\)/\1/p'` # finally write config file echo -e "#\n# autogenerated X hardware configuration by $0\n# \ @@ -229,6 +225,10 @@ pci/agp bus needed for acceleration." ; } [ "${XKEYBOARD}" = "de" ] && \ echo -e '\tOption\t\t"XkbVariant"\t\t"nodeadkeys"' >>$xfc echo -e "EndSection\n\nSection \"$section\"" >>$xfc + # if special synaptics touchpad was detected and specific driver + # is present + # strinfile " synaptics " /tmp/hwsetup.info + # synaptics_drv.o echo -e $InputMouseDef >>$xfc ;; Modes) @@ -323,7 +323,7 @@ for DRIVER in cmd64x hpt366 piix slc90e66 cs5520 it821x rz1000 \ DRIVERLIST="${DRIVERLIST} ${DRIVER}"; } done # check for IDE/SCSI (SATA) - incomplete list -for DRIVER in ata_piix sata_via sata_nv; do +for DRIVER in ata_piix sata_via sata_nv sata_sil sata_sis; do strinfile " ${DRIVER}" /tmp/hwsetup.info && { #SCSIIDE="yes" modprobe ${MODPRV} ${DRIVER} & @@ -345,7 +345,7 @@ fi # remove unneeded network card modules for DRIVER in ${NWMODULES}; do strinfile " ${DRIVER}" /tmp/hwsetup.info || { - rmmod ${DRIVER} + rmmod ${DRIVER} & DRIVERLIST="${DRIVERLIST} ${DRIVER}"; } done # sound card setup (alsa and oss compatibility drivers) |