From: Roy Marples Date: Sat, 24 May 2008 17:30:00 +0000 (+0000) Subject: Style. X-Git-Tag: v4.0.2~338 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2ce838f64925f70b53a5793377cc196409cccf7;p=thirdparty%2Fdhcpcd.git Style. --- diff --git a/dhcpcd-hooks/10-resolv.conf b/dhcpcd-hooks/10-resolv.conf index e91916c4..437c1167 100644 --- a/dhcpcd-hooks/10-resolv.conf +++ b/dhcpcd-hooks/10-resolv.conf @@ -35,6 +35,6 @@ restore_resolv_conf() } case "${reason}" in - BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) make_resolv_conf;; - EXPIRE|FAIL|IPV4LL|RELEASE|STOP) restore_resolv_conf;; +BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) make_resolv_conf;; +EXPIRE|FAIL|IPV4LL|RELEASE|STOP) restore_resolv_conf;; esac diff --git a/dhcpcd-hooks/14-lookup-hostname b/dhcpcd-hooks/14-lookup-hostname index bcb4a1f2..b9ce458a 100644 --- a/dhcpcd-hooks/14-lookup-hostname +++ b/dhcpcd-hooks/14-lookup-hostname @@ -29,5 +29,5 @@ set_hostname() } case "${reason}" in - BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) set_hostname;; +BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) set_hostname;; esac diff --git a/dhcpcd-hooks/15-hostname b/dhcpcd-hooks/15-hostname index 2ba42d51..500ec0f2 100644 --- a/dhcpcd-hooks/15-hostname +++ b/dhcpcd-hooks/15-hostname @@ -17,5 +17,5 @@ set_hostname() } case "${reason}" in - BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) set_hostname;; +BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) set_hostname;; esac diff --git a/dhcpcd-hooks/50-dhcpcd-compat.sh b/dhcpcd-hooks/50-dhcpcd-compat similarity index 89% rename from dhcpcd-hooks/50-dhcpcd-compat.sh rename to dhcpcd-hooks/50-dhcpcd-compat index 9bcd6d29..cba40a49 100644 --- a/dhcpcd-hooks/50-dhcpcd-compat.sh +++ b/dhcpcd-hooks/50-dhcpcd-compat @@ -25,7 +25,7 @@ done x="down" case "${reason}" in - RENEW) x="up";; - BOUND|INFORM|REBIND|REBOOT|TEST|TIMEOUT|IPV4LL) x="new";; +RENEW) x="up";; +BOUND|INFORM|REBIND|REBOOT|TEST|TIMEOUT|IPV4LL) x="new";; esac set -- "" "${x}" diff --git a/dhcpcd-hooks/50-ntp.conf b/dhcpcd-hooks/50-ntp.conf index d3b1c036..a7e8e0bd 100644 --- a/dhcpcd-hooks/50-ntp.conf +++ b/dhcpcd-hooks/50-ntp.conf @@ -46,17 +46,6 @@ restore_ntp_conf() } case "${reason}" in - TEST) - # non op - ;; - BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) - make_ntp_conf - ;; - EXPIRE|FAIL|IPV4LL|RELEASE|STOP) - restore_ntp_conf - ;; - *) - echo "ntp: unsupported reason ${reason}" >&2 - false - ;; +BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) make_ntp_conf;; +EXPIRE|FAIL|IPV4LL|RELEASE|STOP) restore_ntp_conf;; esac diff --git a/dhcpcd-hooks/50-ypbind.conf b/dhcpcd-hooks/50-yp.conf similarity index 82% rename from dhcpcd-hooks/50-ypbind.conf rename to dhcpcd-hooks/50-yp.conf index 238f5d9d..603f267b 100644 --- a/dhcpcd-hooks/50-ypbind.conf +++ b/dhcpcd-hooks/50-yp.conf @@ -43,18 +43,6 @@ restore_yp_conf() } case "${reason}" in - TEST) - # non op - true - ;; - BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) - make_yp_conf - ;; - EXPIRE|FAIL|IPV4LL|RELEASE|STOP) - restore_yp_conf - ;; - *) - echo "ypbind: unsupported reason ${reason}" >&2 - false - ;; +BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) make_yp_conf;; +EXPIRE|FAIL|IPV4LL|RELEASE|STOP) restore_yp_conf;; esac