From: Nathan Wagner <nw@hydaspes.if.org>
Date: Tue, 28 May 2013 07:58:16 +0000 (+0000)
Subject: Added dhcp support to interface scripts
X-Git-Url: https://pd.if.org/git/?p=startuptools;a=commitdiff_plain;h=8ab370eace6aeb1e067fb4175187fd4d7b1235c1

Added dhcp support to interface scripts
---

diff --git a/scripts/ifdown b/scripts/ifdown
index fa92831..836feff 100755
--- a/scripts/ifdown
+++ b/scripts/ifdown
@@ -17,8 +17,7 @@ ifdown_pre() {
 
 . /etc/networks/$net
 
-if [ $enable = 'no' ]; then exit 0; fi
-#if [ $enable -eq 0 ]; then exit 0; fi
+if [ "$enable" = 'no' ]; then exit 0; fi
 
 ifdown_pre
 
@@ -30,11 +29,15 @@ for r in $route; do
 	IFS=';'
 done
 
-for address in $addr do
-	IFS="$saveifs"
-	ip addr del $address dev $dev
-	IFS=';'
-done
+if [ "$addr" = 'dhcp' ]; then
+	/sbin/dhcpcd -q -k $dev
+else
+	for address in $addr; do
+		IFS="$saveifs"
+		ip addr del $address dev $dev
+		IFS=';'
+	done
+fi
 
 # how do we determine if we should bring the link down?
 # there could be other configurations that also set up IP
diff --git a/scripts/ifup b/scripts/ifup
index d5489b1..149cb17 100755
--- a/scripts/ifup
+++ b/scripts/ifup
@@ -24,11 +24,15 @@ ifup_pre
 
 ip link set dev $dev up
 
-for address in $addr; do
-	IFS="$saveifs"
-	ip addr add $address dev $dev
-	IFS=';'
-done
+if [ "$addr" = 'dhcp' ]; then
+	/sbin/dhcpcd -q $dev
+else
+	for address in $addr; do
+		IFS="$saveifs"
+		ip addr add $address dev $dev
+		IFS=';'
+	done
+fi
 
 for r in $route; do
 	IFS="$saveifs"