X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=linuxrc;h=10e677ec4678a37c372a358302ae8bcf8d43b248;hb=5d574dda6739f771891b3bc5be9c3283320ac36f;hp=eaa4376e72fd4e19948488060eca596f94f1f3f0;hpb=13e0a4fb9bd518ad34d7d27384533d7a7ca1f859;p=grml-terminalserver.git

diff --git a/linuxrc b/linuxrc
index eaa4376..10e677e 100755
--- a/linuxrc
+++ b/linuxrc
@@ -392,7 +392,7 @@ if test -z "$NOUSB"; then
   if test -f /modules/div/usbcore.ko; then
     $INSMOD /modules/div/usbcore.ko >/dev/null 2>&1
     FOUNDUSB=""
-    for i in $USB2 uhci-hcd.ko ohci-hcd.ko ; do
+    for i in $USB2 uhci-hcd.ko ohci-hcd.ko usbhid.ko ; do
       test -f /modules/div/$i && $INSMOD /modules/div/$i >/dev/null 2>&1 && FOUNDUSB="yes"
     done
     if test -n "$FOUNDUSB"; then
@@ -549,9 +549,14 @@ if [ -n "$NFS" ]; then
   # loading additional modules
   modLoad sunrpc lockd af_packet nfs
 
-  for INTERFACE in `ifconfig -a | grep '^eth' | sed 's/\ .*//'` ; do
+  dhcp_iface_=$(getbootparam dhcp_iface)
+  if [ -z "$dhcp_iface_" ]; then
+  	dhcp_iface_=`ifconfig -a | grep '^eth' | sed 's/ .*//'`
+  fi
+
+  for INTERFACE in $dhcp_iface_ ; do
       log_begin_msg "Requesting network configuration using udhcp for ${INTERFACE}:" ; echo
-      /static/udhcpc --interface="${INTERFACE}" --foreground --quit --script=/static/udhcp-config.sh
+      /static/timeout 10 /static/udhcpc --interface="${INTERFACE}" --foreground --quit --script=/static/udhcp-config.sh
       # echo "press <enter> to start a system shell and configure your system"
       # sh
   done