From: Roy Marples <roy@marples.name>
Date: Mon, 23 May 2016 19:27:30 +0000 (+0000)
Subject: Test for hostname_fqdn being set to server (new preferred value) or blank
X-Git-Tag: v6.11.1~21
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=895bbd79decf488f1b9a5a120f6ad19111281f30;p=thirdparty%2Fdhcpcd.git

Test for hostname_fqdn being set to server (new preferred value) or blank
(old value). Thanks to Paul Walrath.
---

diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
index 700899f7..eea6a5ce 100644
--- a/dhcpcd-hooks/30-hostname
+++ b/dhcpcd-hooks/30-hostname
@@ -66,7 +66,7 @@ need_hostname()
 	
 	case "$hostname_fqdn" in
 	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|1)	hfqdn=true;;
-	[Ss][Ee][Rr][Vv][Ee][Rr])		;;
+	""|[Ss][Ee][Rr][Vv][Ee][Rr])		;;
 	*)					hshort=true;;
 	esac
 
@@ -115,7 +115,7 @@ set_hostname()
 
 	case "$hostname_fqdn" in
 	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|1)	hfqdn=true;;
-	"")					;;
+	""|[Ss][Ee][Rr][Vv][Ee][Rr])		;;
 	*)					hshort=true;;
 	esac