From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 22 Aug 2018 12:36:23 +0000 (+0100)
Subject: localnet: Set FQDN without using domainname command
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95b87f39ac309eb352dca6adbccfcff631bfe914;p=people%2Fms%2Fipfire-2.x.git

localnet: Set FQDN without using domainname command

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/initscripts/system/localnet b/src/initscripts/system/localnet
index 97f4d381c9..a16b32e46d 100644
--- a/src/initscripts/system/localnet
+++ b/src/initscripts/system/localnet
@@ -36,16 +36,10 @@ case "${1}" in
 		ip link set lo up
 		evaluate_retval
 
-		boot_mesg "Setting hostname to ${HOSTNAME}..."
-		hostname "${HOSTNAME}"
+		boot_mesg "Setting hostname to ${HOSTNAME}.${DOMAINNAME}..."
+		hostname "${HOSTNAME}.${DOMAINNAME}"
 		evaluate_retval
 
-		if [ -n "${DOMAINNAME}" ]; then
-			boot_mesg "Setting domainname to ${DOMAINNAME}..."
-			domainname "${DOMAINNAME}"
-			evaluate_retval
-		fi
-
 		# Update hosts
 		write_hosts