X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=scripts%2Fifup;h=07395fb4e4930ba01d48d2b3d0e0a8308aa6f712;hb=aa442d5cc6c7325cbe3422a5c6cd6ec71f832ecc;hp=d9f2df42814ae77bbdffa16adffd3ed47f6dda49;hpb=4fe655b1905363af2df163a5ee9ab89ca7790c49;p=startuptools

diff --git a/scripts/ifup b/scripts/ifup
index d9f2df4..07395fb 100755
--- a/scripts/ifup
+++ b/scripts/ifup
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 net=$1
 
 saveifs="$IFS"
@@ -22,13 +24,20 @@ if [ "$enable" = 'no' ]; then exit 0; fi
 
 ifup_pre
 
+# need to check to make sure the link exists
+test ip link show dev $dev >/dev/null 2>&1 || exit 1
+
 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"