[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.0-1-18-gb891450

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 4437f9803d15e901fb06cc44a62737421b9e7cd8
Author: Andrew Pollock <apollock at icarus.andrew.net.au>
Date:   Sun Jul 12 21:33:32 2009 -0700

    Remove "3" references from dhclient-script

diff --git a/debian/dhclient-script.kfreebsd b/debian/dhclient-script.kfreebsd
index cc556f4..22c7fad 100644
--- a/debian/dhclient-script.kfreebsd
+++ b/debian/dhclient-script.kfreebsd
@@ -69,12 +69,12 @@ exit_with_hooks() {
     exit_status=$1
 
     # Source the documented exit-hook script, if it exists
-    if ! run_hook /etc/dhcp3/dhclient-exit-hooks "$@"; then
+    if ! run_hook /etc/dhcp/dhclient-exit-hooks "$@"; then
         exit_status=$?
     fi
 
     # Now run scripts in the Debian-specific directory.
-    if ! run_hookdir /etc/dhcp3/dhclient-exit-hooks.d "$@"; then
+    if ! run_hookdir /etc/dhcp/dhclient-exit-hooks.d "$@"; then
         exit_status=$?
     fi
 
@@ -114,8 +114,8 @@ fi
 # The action starts here
 
 # Invoke the local dhcp client enter hooks, if they exist.
-run_hook /etc/dhcp3/dhclient-enter-hooks
-run_hookdir /etc/dhcp3/dhclient-enter-hooks.d
+run_hook /etc/dhcp/dhclient-enter-hooks
+run_hookdir /etc/dhcp/dhclient-enter-hooks.d
 
 # Execute the operation
 case "$reason" in
diff --git a/debian/dhclient-script.linux b/debian/dhclient-script.linux
index cb3c448..b72e501 100644
--- a/debian/dhclient-script.linux
+++ b/debian/dhclient-script.linux
@@ -87,12 +87,12 @@ exit_with_hooks() {
     exit_status=$1
 
     # Source the documented exit-hook script, if it exists
-    if ! run_hook /etc/dhcp3/dhclient-exit-hooks "$@"; then
+    if ! run_hook /etc/dhcp/dhclient-exit-hooks "$@"; then
         exit_status=$?
     fi
 
     # Now run scripts in the Debian-specific directory.
-    if ! run_hookdir /etc/dhcp3/dhclient-exit-hooks.d "$@"; then
+    if ! run_hookdir /etc/dhcp/dhclient-exit-hooks.d "$@"; then
         exit_status=$?
     fi
 
@@ -137,8 +137,8 @@ fi
 # The action starts here
 
 # Invoke the local dhcp client enter hooks, if they exist.
-run_hook /etc/dhcp3/dhclient-enter-hooks
-run_hookdir /etc/dhcp3/dhclient-enter-hooks.d
+run_hook /etc/dhcp/dhclient-enter-hooks
+run_hookdir /etc/dhcp/dhclient-enter-hooks.d
 
 # Execute the operation
 case "$reason" in

-- 
ISC DHCP packaging for Debian