Use -f instead of -x to look for hooks.

diff --git a/client/scripts/bsdos b/client/scripts/bsdos
index 1f6dede8dc39e8fc45ebf76498d9c5a81b001995..13be70085b7108ca11072ad744884d2565a3cc71 100755 (executable)
--- a/client/scripts/bsdos
+++ b/client/scripts/bsdos
@@ -10,7 +10,7 @@ make_resolv_conf() {
 # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
 exit_with_hooks() {
   exit_status=$1
-  if [ -x /etc/dhclient-exit-hooks ]; then
+  if [ -f /etc/dhclient-exit-hooks ]; then
     . /etc/dhclient-exit-hooks
   fi
 # probably should do something with exit status of the local script
@@ -18,7 +18,7 @@ exit_with_hooks() {
 }
 
 # Invoke the local dhcp client enter hooks, if they exist.
-if [ -x /etc/dhclient-enter-hooks ]; then
+if [ -f /etc/dhclient-enter-hooks ]; then
   exit_status=0
   . /etc/dhclient-enter-hooks
   # allow the local script to abort processing of this state

diff --git a/client/scripts/freebsd b/client/scripts/freebsd
index b9d7a36c58ed032afbbff6c4c14845cc20b7c62c..4f2d971fa462f1201a5b52998bdeb3d5fa412ac5 100755 (executable)
--- a/client/scripts/freebsd
+++ b/client/scripts/freebsd
@@ -16,7 +16,7 @@ make_resolv_conf() {
 # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
 exit_with_hooks() {
   exit_status=$1
-  if [ -x /etc/dhclient-exit-hooks ]; then
+  if [ -f /etc/dhclient-exit-hooks ]; then
     . /etc/dhclient-exit-hooks
   fi
 # probably should do something with exit status of the local script
@@ -24,7 +24,7 @@ exit_with_hooks() {
 }
 
 # Invoke the local dhcp client enter hooks, if they exist.
-if [ -x /etc/dhclient-enter-hooks ]; then
+if [ -f /etc/dhclient-enter-hooks ]; then
   exit_status=0
   . /etc/dhclient-enter-hooks
   # allow the local script to abort processing of this state

diff --git a/client/scripts/linux b/client/scripts/linux
index 620efd51253b25582910669e9965b2526ccc891a..9f02f23f3794b03cfaef6781aa7a2e9d2a3d0708 100755 (executable)
--- a/client/scripts/linux
+++ b/client/scripts/linux
@@ -32,7 +32,7 @@ function make_resolv_conf() {
 # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
 function exit_with_hooks() {
   exit_status=$1
-  if [ -x /etc/dhclient-exit-hooks ]; then
+  if [ -f /etc/dhclient-exit-hooks ]; then
     . /etc/dhclient-exit-hooks
   fi
 # probably should do something with exit status of the local script
@@ -40,7 +40,7 @@ function exit_with_hooks() {
 }
 
 # Invoke the local dhcp client enter hooks, if they exist.
-if [ -x /etc/dhclient-enter-hooks ]; then
+if [ -f /etc/dhclient-enter-hooks ]; then
   exit_status=0
   . /etc/dhclient-enter-hooks
   # allow the local script to abort processing of this state

diff --git a/client/scripts/netbsd b/client/scripts/netbsd
index 404b7ac3cfb012643de715b26ad09661dd576059..f61d0e788fbbec0cac1bb4a5a7b52dc09c016709 100755 (executable)
--- a/client/scripts/netbsd
+++ b/client/scripts/netbsd
@@ -10,7 +10,7 @@ make_resolv_conf() {
 # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
 exit_with_hooks() {
   exit_status=$1
-  if [ -x /etc/dhclient-exit-hooks ]; then
+  if [ -f /etc/dhclient-exit-hooks ]; then
     . /etc/dhclient-exit-hooks
   fi
 # probably should do something with exit status of the local script
@@ -18,7 +18,7 @@ exit_with_hooks() {
 }
 
 # Invoke the local dhcp client enter hooks, if they exist.
-if [ -x /etc/dhclient-enter-hooks ]; then
+if [ -f /etc/dhclient-enter-hooks ]; then
   exit_status=0
   . /etc/dhclient-enter-hooks
   # allow the local script to abort processing of this state

diff --git a/client/scripts/openbsd b/client/scripts/openbsd
index 1f6dede8dc39e8fc45ebf76498d9c5a81b001995..13be70085b7108ca11072ad744884d2565a3cc71 100644 (file)
--- a/client/scripts/openbsd
+++ b/client/scripts/openbsd
@@ -10,7 +10,7 @@ make_resolv_conf() {
 # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
 exit_with_hooks() {
   exit_status=$1
-  if [ -x /etc/dhclient-exit-hooks ]; then
+  if [ -f /etc/dhclient-exit-hooks ]; then
     . /etc/dhclient-exit-hooks
   fi
 # probably should do something with exit status of the local script
@@ -18,7 +18,7 @@ exit_with_hooks() {
 }
 
 # Invoke the local dhcp client enter hooks, if they exist.
-if [ -x /etc/dhclient-enter-hooks ]; then
+if [ -f /etc/dhclient-enter-hooks ]; then
   exit_status=0
   . /etc/dhclient-enter-hooks
   # allow the local script to abort processing of this state

diff --git a/client/scripts/solaris b/client/scripts/solaris
index 7ad7eaf89e45e11715caa19176752876bb8fe773..21e83fa0355e5c0b497eddc8828288730be93105 100755 (executable)
--- a/client/scripts/solaris
+++ b/client/scripts/solaris
@@ -10,7 +10,7 @@ make_resolv_conf() {
 # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
 exit_with_hooks() {
   exit_status=$1
-  if [ -x /etc/dhclient-exit-hooks ]; then
+  if [ -f /etc/dhclient-exit-hooks ]; then
     . /etc/dhclient-exit-hooks
   fi
 # probably should do something with exit status of the local script
@@ -18,7 +18,7 @@ exit_with_hooks() {
 }
 
 # Invoke the local dhcp client enter hooks, if they exist.
-if [ -x /etc/dhclient-enter-hooks ]; then
+if [ -f /etc/dhclient-enter-hooks ]; then
   exit_status=0
   . /etc/dhclient-enter-hooks
   # allow the local script to abort processing of this state