From: Roy Marples <roy@marples.name>
Date: Tue, 24 Aug 2010 10:18:31 +0000 (+0000)
Subject: Improve scripts for DUMP
X-Git-Tag: v5.2.9~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6858a9df02fdab62bfbfa89b7d662178fda5eda9;p=thirdparty%2Fdhcpcd.git

Improve scripts for DUMP
---

diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu
index 3f6e1750..639697c9 100644
--- a/dhcpcd-hooks/10-mtu
+++ b/dhcpcd-hooks/10-mtu
@@ -4,7 +4,7 @@ mtu_dir="$state_dir/mtu"
 
 if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then
 	rm "$mtu_dir/$interface"
-elif [ "$reason" != TEST -a -n "$new_interface_mtu" ]; then
+elif [ -n "$new_interface_mtu" ] && $if_up; then
 	# The smalled MTU dhcpcd can work with is 576
 	if [ "$new_interface_mtu" -ge 576 ]; then
 		if ifconfig "$interface" mtu "$new_interface_mtu"; then
@@ -16,10 +16,12 @@ elif [ "$reason" != TEST -a -n "$new_interface_mtu" ]; then
 			fi
 		fi
 	fi
-elif [ "$reason" != TEST -a -e "$mtu_dir/$interface" ]; then
-	# No MTU in this state, so restore the prior MTU
-	mtu=$(cat "$mtu_dir/$interface")
-	syslog info "$interface: MTU restored to $mtu"
-	ifconfig "$interface" mtu "$mtu"
-	rm "$mtu_dir/$interface"
+elif [ -e "$mtu_dir/$interface" ]; then
+	if $if_up || $if_down; then
+		# No MTU in this state, so restore the prior MTU
+		mtu=$(cat "$mtu_dir/$interface")
+		syslog info "$interface: MTU restored to $mtu"
+		ifconfig "$interface" mtu "$mtu"
+		rm "$mtu_dir/$interface"
+	fi
 fi
diff --git a/dhcpcd-hooks/50-ypbind b/dhcpcd-hooks/50-ypbind
index 3d569467..3e569c73 100644
--- a/dhcpcd-hooks/50-ypbind
+++ b/dhcpcd-hooks/50-ypbind
@@ -70,17 +70,12 @@ restore_yp_binding()
 	fi
 }
 
-case "$reason" in
-PREINIT)
+if [ "$reason" = PREINIT ]; then
 	rm -f "$ypbind_dir/$interface"
-	;;
-TEST)
-	;;
-*)
+else if $if_up || $if_down; then
 	if [ -n "$new_nis_domain" ]; then
 		make_yp_binding
 	elif [ -n "$old_nis_domain" ]; then
 		restore_yp_binding
 	fi
-	;;
-esac
+fi