[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 1e32771f65ad538b29e8442c2232c6926623e8f4
Author: Peter Marschall <peter at adpm.de>
Date:   Sat Jan 8 14:04:56 2011 +0100

    dhclient-script.{linux.kfreebsd}: check for $new_domain_search
    
    Check for $new_domain_search in make_resolv_conf() too, as trigger
    to start updating /etc/resolv.conf
    
    Signed-off-by: Peter Marschall <peter at adpm.de>

diff --git a/debian/dhclient-script.kfreebsd b/debian/dhclient-script.kfreebsd
index 2f49165..b6f3bfd 100644
--- a/debian/dhclient-script.kfreebsd
+++ b/debian/dhclient-script.kfreebsd
@@ -4,7 +4,8 @@
 
 make_resolv_conf() {
     local new_resolv_conf
-    if [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then
+    if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] ||
+       [ -n "$new_domain_name_servers" ]; then
         new_resolv_conf=/etc/resolv.conf.dhclient-new
         rm -f $new_resolv_conf
         if [ -n "$new_domain_name" ]; then
diff --git a/debian/dhclient-script.linux b/debian/dhclient-script.linux
index 811a307..6f9c726 100644
--- a/debian/dhclient-script.linux
+++ b/debian/dhclient-script.linux
@@ -14,7 +14,8 @@
 
 make_resolv_conf() {
     local new_resolv_conf
-    if [ "$new_domain_name" ] || [ "$new_domain_name_servers" ]; then
+    if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] ||
+       [ -n "$new_domain_name_servers" ]; then
         new_resolv_conf=/etc/resolv.conf.dhclient-new
         rm -f $new_resolv_conf
         if [ "$new_domain_name" ]; then

-- 
ISC DHCP packaging for Debian