[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 658c5b0d9b06b5f663e4160f116bc95a42bdc221
Author: Peter Marschall <peter at adpm.de>
Date:   Sat Jan 8 14:28:47 2011 +0100

    dhclient-script.linux: synchronize a bit more with dhclient-script.kfreebsd
    
    Change
    	if [ "$..." ]
    to
    	if [ -n "$..." ]
    to minimize differences to dhclient-script.kfreebsd
    
    Signed-off-by: Peter Marschall <peter at adpm.de>

diff --git a/debian/dhclient-script.linux b/debian/dhclient-script.linux
index 6f9c726..12583db 100644
--- a/debian/dhclient-script.linux
+++ b/debian/dhclient-script.linux
@@ -18,12 +18,12 @@ make_resolv_conf() {
        [ -n "$new_domain_name_servers" ]; then
         new_resolv_conf=/etc/resolv.conf.dhclient-new
         rm -f $new_resolv_conf
-        if [ "$new_domain_name" ]; then
+        if [ -n "$new_domain_name" ]; then
             echo domain ${new_domain_name%% *} >>$new_resolv_conf
         fi
-        if [ "$new_domain_search" ]; then
+        if [ -n "$new_domain_search" ]; then
             #new_domain_search="${new_domain_search% }"
-            if [ "$new_domain_name" ]; then
+            if [ -n "$new_domain_name" ]; then
                 domain_in_search_list=""
                 for domain in $new_domain_search; do
                     if [ "$domain" = "${new_domain_name}" ] ||
@@ -36,10 +36,10 @@ make_resolv_conf() {
                 fi
             fi
             echo "search ${new_domain_search}" >> $new_resolv_conf
-        elif [ "$new_domain_name" ]; then
+        elif [ -n "$new_domain_name" ]; then
             echo "search ${new_domain_name}" >> $new_resolv_conf
         fi
-        if [ "$new_domain_name_servers" ]; then
+        if [ -n "$new_domain_name_servers" ]; then
             for nameserver in $new_domain_name_servers; do
                 echo nameserver $nameserver >>$new_resolv_conf
             done

-- 
ISC DHCP packaging for Debian