diff options
author | Dirk von Suchodoletz | 2007-01-22 01:47:54 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2007-01-22 01:47:54 +0100 |
commit | 30692c67a567c223b3fb752fd8781407c783db79 (patch) | |
tree | 91fd28612f45e5119ccfef33900564b4d7947848 /initramfs/initrd-stuff/bin | |
parent | Removes faulty error messages (diff) | |
download | core-30692c67a567c223b3fb752fd8781407c783db79.tar.gz core-30692c67a567c223b3fb752fd8781407c783db79.tar.xz core-30692c67a567c223b3fb752fd8781407c783db79.zip |
Recoded the shell "(u)sleep" functions, depends on /proc by now, but
should not impose to much (obsoletes rev. 629). Added AUTHORS file.
Switched
off halt/shutdown links for initial/boot.d scripts (in functions seems
no need,
but may produce problems if switched on)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@640 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/bin')
-rwxr-xr-x | initramfs/initrd-stuff/bin/hwautocfg | 20 | ||||
-rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 19 |
2 files changed, 24 insertions, 15 deletions
diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg index eeea00d7..ad2ac3cc 100755 --- a/initramfs/initrd-stuff/bin/hwautocfg +++ b/initramfs/initrd-stuff/bin/hwautocfg @@ -1,13 +1,19 @@ #!/bin/sh +# Copyright (c) 2003 - 2006 - RZ Uni Freiburg +# Copyright (c) 2006, 2007 - OpenSLX GmbH # -# universal (distro independent) hardware autoconfiguration script for -# OpenSLX linux diskless clients, using hwconfig from knoppix as base tool +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your feedback to feedback@openslx.org # -# Dirk von Suchodoletz <dvs@OpenSLX.com>, 16-12-2006 +# General information about OpenSLX can be found under http://openslx.org # -# (c) 2003 - 2006 - RZ Universitaet Freiburg -# (c) 2006 - OpenSLX.org Project +# universal (distro independent) hardware autoconfiguration script for +# OpenSLX linux diskless clients, using hwconfig from knoppix as base tool +############################################################################# # local functions used within hwautocfg displaysetup () { # (temporary) configuration file @@ -348,7 +354,7 @@ modprobe ${MODPRV} snd-mixer-oss test -f /proc/bus/usb/devices || \ mount -n -t usbfs usbfs /proc/bus/usb 2>/dev/null [ -n "$IDE" ] && modprobe -q ide_generic 2>/dev/null -usleep 10 && hwsetup -v > /tmp/hwsetup.info +usleep 200 && hwsetup -v > /tmp/hwsetup.info # remaining drivers listed in /tmp/hwsetup.info cat /tmp/hwsetup.info| while read LINE ; do if strinstr "driver:" "${LINE}"; then @@ -356,7 +362,7 @@ cat /tmp/hwsetup.info| while read LINE ; do if ! strinstr " ${DRIVER} " "${DRIVERLIST}"; then strinstr "Card:" "${DRIVER}" || strinstr "ps/2" "${DRIVER}" || { modprobe ${MODPRV} ${DRIVER} & - usleep 8; } + usleep 100; } DRIVERLIST="${DRIVERLIST} ${DRIVER}" fi fi diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index 9155a2de..6a857892 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -1,17 +1,20 @@ #!/bin/sh +# Copyright (c) 2003 - 2006 - RZ Uni Freiburg +# Copyright (c) 2006, 2007 - OpenSLX GmbH +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your feedback to feedback@openslx.org +# +# General information about OpenSLX can be found under http://openslx.org # # universal (distro independent) configuration script for OpenSLX linux # diskless clients (executed in stage3 within initial ramfs). The file- # system is setup when servconfig starts -# -# Dirk von Suchodoletz <dvs@OpenSLX.com>, 14-12-2006 -# Michael Janczyk <mj0@uni-freiburg.de>, 10-01-2007 -# Lars Mueller <lm@OpenSLX.com>, 23-06-2006 -# Oliver Tappe <ot@OpenSLX.com>, 23-06-2006 -# -# (c) 2006 - RZ Universitaet Freiburg -# (c) 2006 - OpenSLX.ORG Project +############################################################################# # check for configuration files to source # functions common for all distros, messages contains all error and |