[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-14-g02638d8

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 3ff013ca40df10578869591208e5e12b52998840
Author: Peter Marschall <peter at adpm.de>
Date:   Sat Jan 8 19:36:48 2011 +0100

    dhclient-script.{linux,kfreebsd}: remove unused variables
    
    * $old_subnet_arg is nowhere used in dhclient-script.{linux,kfreebsd},
      so remove its definition.
    * the same applies to $safe_exit_satus
    * $new_domain_search is a list of domain names that cannot sensibly end
      with spaces. Remove this check
    
    Signed-off-by: Peter Marschall <peter at adpm.de>

diff --git a/debian/dhclient-script.kfreebsd b/debian/dhclient-script.kfreebsd
index ef72750..f3f93bd 100644
--- a/debian/dhclient-script.kfreebsd
+++ b/debian/dhclient-script.kfreebsd
@@ -16,7 +16,6 @@ make_resolv_conf() {
         fi
 
         if [ -n "$new_domain_search" ]; then
-            new_domain_search="${new_domain_search% }"
             if [ -n "$new_domain_name" ]; then
                 new_domain_search="$new_domain_name $new_domain_search"
             fi
@@ -52,7 +51,6 @@ run_hook() {
 
     if [ -n "$exit_status" ] && [ "$exit_status" -ne 0 ]; then
         logger -p daemon.err "$script returned non-zero exit status $exit_status"
-        save_exit_status=$exit_status
     fi
 
     return $exit_status
@@ -103,9 +101,6 @@ fi
 if [ -n "$new_subnet_mask" ]; then
     new_subnet_arg="netmask $new_subnet_mask"
 fi
-if [ -n "$old_subnet_mask" ]; then
-    old_subnet_arg="netmask $old_subnet_mask"
-fi
 if [ -n "$alias_subnet_mask" ]; then
     alias_subnet_arg="netmask $alias_subnet_mask"
 fi
diff --git a/debian/dhclient-script.linux b/debian/dhclient-script.linux
index 7f74b4e..3ab16bf 100644
--- a/debian/dhclient-script.linux
+++ b/debian/dhclient-script.linux
@@ -27,7 +27,6 @@ make_resolv_conf() {
         fi
 
         if [ -n "$new_domain_search" ]; then
-            #new_domain_search="${new_domain_search% }"
             if [ -n "$new_domain_name" ]; then
                 domain_in_search_list=""
                 for domain in $new_domain_search; do
@@ -92,7 +91,6 @@ run_hook() {
 
     if [ -n "$exit_status" ] && [ "$exit_status" -ne 0 ]; then
         logger -p daemon.err "$script returned non-zero exit status $exit_status"
-        save_exit_status=$exit_status
     fi
 
     return $exit_status
@@ -143,9 +141,6 @@ fi
 if [ -n "$new_subnet_mask" ]; then
     new_subnet_arg="netmask $new_subnet_mask"
 fi
-if [ -n "$old_subnet_mask" ]; then
-    old_subnet_arg="netmask $old_subnet_mask"
-fi
 if [ -n "$alias_subnet_mask" ]; then
     alias_subnet_arg="netmask $alias_subnet_mask"
 fi

-- 
ISC DHCP packaging for Debian