diff options
| author | Nico Dietrich | 2006-01-26 22:59:47 +0100 |
|---|---|---|
| committer | Nico Dietrich | 2006-01-26 22:59:47 +0100 |
| commit | 3bd54055f8885dfe17639fca06c772ff6c4ec3a2 (patch) | |
| tree | a8206d0430aa6f3f34a56da8b9b16d785a5a5981 /initrd/initrd-stuff | |
| parent | hal and haldaemon differences in SuSE 9.3 and 10. Do not give start and (diff) | |
| download | core-3bd54055f8885dfe17639fca06c772ff6c4ec3a2.tar.gz core-3bd54055f8885dfe17639fca06c772ff6c4ec3a2.tar.xz core-3bd54055f8885dfe17639fca06c772ff6c4ec3a2.zip | |
einige bugfixes
git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@44 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff')
| -rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 6 | ||||
| -rw-r--r-- | initrd/initrd-stuff/etc/functions | 2 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/init | 9 |
3 files changed, 10 insertions, 7 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg index 392ab93b..d722015e 100755 --- a/initrd/initrd-stuff/bin/hwautocfg +++ b/initrd/initrd-stuff/bin/hwautocfg @@ -174,8 +174,8 @@ for section in Files ServerFlags Module InputDevice Monitor \ echo -e ${ServerFlags} >>$xfc ;; Device) - echo -e ${Device} | sed -e "s,XMODULE,${XMODULE},g" \ - -e "s,XDESC,${XDESC}," >>$xfc + echo -e ${Device} | \ + sed -e "s,XMODULE,${XMODULE}," -e "s%XDESC%${XDESC}%" >>$xfc # special options may be needed for some drivers [ $DEBUGLEVEL -gt 1 ] && msg "X setup" \ "adding for some Xfree86 modules \ @@ -303,7 +303,7 @@ waitfor /tmp/hwrun1 50000 || \ Please check that\n hwsetup is properly installed and executable." # "drivers" (pseudo, placeholder strings, ...) to exclude from loading -DRIVERLIST="disabled unknown ignore pcspkr synaptics" +DRIVERLIST="disabled unknown ignore pcspkr synaptics keybdev" # driver blacklist (real modules which fail to load) DRIVERLIST=${DRIVERLIST}" hw_random" # check for USB, pcmcia and ieee1394 hardware drivers diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions index 15237680..586c1854 100644 --- a/initrd/initrd-stuff/etc/functions +++ b/initrd/initrd-stuff/etc/functions @@ -31,7 +31,7 @@ if [ -n "$2" ] ; then echo -e "$message This error is not fatal - continuing ...\n" [ "$DEBUGLEVEL" -gt 2 ] && usleep 20 else - echo -e "Running shell for debugging purposes now ...\n" + echo -e "$message Running shell for debugging purposes now ...\n" /bin/sh fi } diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index a81bbcb1..4f9333ac 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -113,8 +113,8 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup tmpfssize=*) TMPFSSIZE=${opts#tmpfssize=};; # vendor code identifier for dhcp requests - vci=*|VCI=*) - VCI=${opts#VCI=};; + vci=*) + VCI=${opts#vci=};; esac done # check if at least one type of IP configuration is availabe @@ -190,6 +190,10 @@ echo "dhcp:x:101:" > /etc/group if [ -n "$noipyet" ] ; then waitfor /tmp/dhcp-done 20000 . /etc/machine-setup + [ -z "$clientip" -o -z "$subnet_mask" -o -z "$gateway" \ + -o -z "$broadcast_address" ] && error " Did not get complete IP \ +configuration via DHCP. You may want to add\n a vendor code identifier \ +via kernel commandline (vci=VCI)." ipsetup $clientip $subnet_mask $gateway $broadcast_address eth0 fi [ -n "$LDAP" ] && ldapconf & @@ -377,7 +381,6 @@ and list the modules loaded until\n now." waitfor /tmp/svcfg 20000 || error " For some reason the software config \ of this client did not finish in\n time. You might check the process list \ and list the modules loaded until\n now." -bash # IP configuration is made and should not be updated automatically killall -9 dhcpcd dhclient pump 2>/dev/null # unmount the bind mounted modules directory |