From: Michael Prokop <mika@grml.org>
Date: Mon, 20 Nov 2006 23:23:55 +0000 (+0100)
Subject: Support bootoption dhcp_iface via /linuxrc for selection of
X-Git-Tag: 0.76
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=refs%2Ftags%2F0.76;p=grml-terminalserver.git

Support bootoption dhcp_iface via /linuxrc for selection of
network device, thanks for the patch - Wolfgang Karall!
---

diff --git a/debian/changelog b/debian/changelog
index 10a3236..7a3bf35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-terminalserver (0.76) unstable; urgency=low
+
+  * Support bootoption dhcp_iface via /linuxrc for selection of
+    network device, thanks for the patch - Wolfgang Karall!
+
+ -- Michael Prokop <mika@grml.org>  Tue, 21 Nov 2006 00:22:51 +0100
+
 grml-terminalserver (0.75) unstable; urgency=low
 
   * Support usbhid module in /linuxrc.
diff --git a/linuxrc b/linuxrc
index e9d5629..10e677e 100755
--- a/linuxrc
+++ b/linuxrc
@@ -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 <enter> to start a system shell and configure your system"