From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 30 Jun 2018 18:58:42 +0000 (+0100)
Subject: localnet: Don't write local hostname to /etc/hosts
X-Git-Tag: v2.21-core123~105
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=4c0bd63ea4c21eb8140eb5a54b2eeda4b43b7e8e

localnet: Don't write local hostname to /etc/hosts

This is now being provided by nss-myhostname

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

diff --git a/src/initscripts/system/localnet b/src/initscripts/system/localnet
index 7ff18d7b47..e071216fd9 100644
--- a/src/initscripts/system/localnet
+++ b/src/initscripts/system/localnet
@@ -23,14 +23,8 @@ write_resolv_conf() {
 }
 
 write_hosts() {
-	eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
-
 	(
 		echo "127.0.0.1	localhost.localdomain localhost"
-
-		if [ -n "${GREEN_ADDRESS}" ]; then
-			echo "${GREEN_ADDRESS} ${HOSTNAME}.${DOMAINNAME} ${HOSTNAME}"
-		fi
 	) > /etc/hosts
 }