X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=linuxrc;h=10e677ec4678a37c372a358302ae8bcf8d43b248;hb=5d574dda6739f771891b3bc5be9c3283320ac36f;hp=5ab61ff4a7f73c5c9590226fb24e55c49bf6a5b0;hpb=5cfde9a53ae09722a416e17f83d470b5fbae614f;p=grml-terminalserver.git diff --git a/linuxrc b/linuxrc index 5ab61ff..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,7 +549,12 @@ 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/timeout 10 /static/udhcpc --interface="${INTERFACE}" --foreground --quit --script=/static/udhcp-config.sh # echo "press to start a system shell and configure your system"