[pkg-dhcp-commits] [isc-dhcp] 03/09: avoid condition where hostname could be set to (none)

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository isc-dhcp.

commit 268008d3bdc6f4ea52c74d7c422290ba6ab33786
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Sep 5 18:45:55 2015 +0000

    avoid condition where hostname could be set to (none)
---
 debian/changelog             | 2 ++
 debian/dhclient-script.linux | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 673d15d..2ba493d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ isc-dhcp (4.3.2-2) UNRELEASED; urgency=medium
   * Fix undefined variables in dhclient-script.kfreebsd (closes: #691090).
     - Thanks to Peter Marschall.
   * Make policycoreutils a dependency of isc-dhcp-server (closes: #797276).
+  * Avoid condition where hostname could be set to '(none)' (closes: #604883).
+    - Thanks to Pavel Cahyna.
 
  -- Michael Gilbert <mgilbert at debian.org>  Sat, 27 Jun 2015 15:31:48 +0000
 
diff --git a/debian/dhclient-script.linux b/debian/dhclient-script.linux
index 14e68d4..376a094 100644
--- a/debian/dhclient-script.linux
+++ b/debian/dhclient-script.linux
@@ -99,7 +99,7 @@ set_hostname() {
            [ "$current_hostname" = '(none)' ] ||
            [ "$current_hostname" = 'localhost' ] ||
            [ "$current_hostname" = "$old_host_name" ]; then
-           if [ "$new_host_name" != "$old_host_name" ]; then
+           if [ "$new_host_name" != "$current_host_name" ]; then
                hostname "$new_host_name"
            fi
         fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git