Mercurial > hg > dhcpcd

changeset 1544:c487960654c7 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
if_up and if_down variables allow more flexability.
author Roy Marples <roy@marples.name>
date Sat, 07 Aug 2010 19:44:21 +0000
parents 12b45ea48df6
children dcc62504b5bf
files dhcpcd-hooks/20-resolv.conf dhcpcd-hooks/29-lookup-hostname dhcpcd-hooks/30-hostname dhcpcd-hooks/50-ntp.conf dhcpcd-hooks/50-yp.conf dhcpcd-run-hooks.in
diffstat 6 files changed, 28 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/dhcpcd-hooks/20-resolv.conf	Wed Aug 04 06:59:15 2010 +0000
+++ b/dhcpcd-hooks/20-resolv.conf	Sat Aug 07 19:44:21 2010 +0000
@@ -119,7 +119,8 @@
 	fi
 }
 
-case "$reason" in
-BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC)	add_resolv_conf;;
-PREINIT|EXPIRE|FAIL|IPV4LL|NAK|NOCARRIER|RELEASE|STOP)	remove_resolv_conf;;
-esac
+if $if_up; then
+	add_resolv_conf
+elif $if_down; then
+	remove_resolv_conf
+fi
--- a/dhcpcd-hooks/29-lookup-hostname	Wed Aug 04 06:59:15 2010 +0000
+++ b/dhcpcd-hooks/29-lookup-hostname	Sat Aug 07 19:44:21 2010 +0000
@@ -29,6 +29,6 @@
 	fi
 }
 
-case "$reason" in
-BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC)	set_hostname;;
-esac
+if $if_up; then
+	set_hostname
+fi
--- a/dhcpcd-hooks/30-hostname	Wed Aug 04 06:59:15 2010 +0000
+++ b/dhcpcd-hooks/30-hostname	Sat Aug 07 19:44:21 2010 +0000
@@ -29,6 +29,6 @@
 	fi
 }
 
-case "$reason" in
-BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC)	set_hostname;;
-esac
+if $if_up; then
+	set_hostname
+fi
--- a/dhcpcd-hooks/50-ntp.conf	Wed Aug 04 06:59:15 2010 +0000
+++ b/dhcpcd-hooks/50-ntp.conf	Sat Aug 07 19:44:21 2010 +0000
@@ -101,7 +101,8 @@
 	build_ntp_conf
 }
 
-case "$reason" in
-BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC) 	add_ntp_conf add;;
-PREINIT|EXPIRE|FAIL|IPV4LL|NAK|NOCARRIER|RELEASE|STOP)	remove_ntp_conf del;;
-esac
+if $if_up; then
+	add_ntp_conf add
+elif $if_down; then
+	remove_ntp_conf del
+fi
--- a/dhcpcd-hooks/50-yp.conf	Wed Aug 04 06:59:15 2010 +0000
+++ b/dhcpcd-hooks/50-yp.conf	Sat Aug 07 19:44:21 2010 +0000
@@ -44,7 +44,8 @@
 	fi
 }
 
-case "$reason" in
-BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC)	make_yp_conf;;
-EXPIRE|FAIL|IPV4LL|NAK|NOCARRIER|RELEASE|STOP)		restore_yp_conf;;
-esac
+if $if_up; then
+	make_yp_conf
+elif $if_down; then
+	restore_yp_conf
+fi
--- a/dhcpcd-run-hooks.in	Wed Aug 04 06:59:15 2010 +0000
+++ b/dhcpcd-run-hooks.in	Sat Aug 07 19:44:21 2010 +0000
@@ -9,6 +9,13 @@
 signature_end="$signature_base_end $from $interface"
 state_dir=/var/run/dhcpcd
 
+if_up=false
+if_down=false
+case "$reason" in
+BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC)	if_up=true;;
+PREINIT|EXPIRE|FAIL|IPV4LL|NAK|NOCARRIER|RELEASE|STOP)	if_down=true;;
+esac
+
 # Ensure that all arguments are unique
 uniqify()
 {