From 33c8d8d123739569e649bdef32c924b224a45686 Mon Sep 17 00:00:00 2001
From: Filip Hajny <filip@hajny.net>
Date: Tue, 5 Mar 2013 15:04:28 +0100
Subject: [PATCH] Change how hostnames work: - only use shortform for
 /etc/nodename (no domain appended) - only add hostname to the 127.0.0.1 entry
 in /etc/inet/hosts - do not add any entries to /etc/inet/hosts for
 public/private IPs

---
 zoneinit/includes/02-config.sh  |  4 ++--
 zoneinit/includes/12-network.sh | 15 +++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/zoneinit/includes/02-config.sh b/zoneinit/includes/02-config.sh
index d3e13bc..3d3bc5a 100644
--- a/zoneinit/includes/02-config.sh
+++ b/zoneinit/includes/02-config.sh
@@ -63,8 +63,8 @@ else
   fi
 
   : ${ZONENAME:=$(zonename)}
-  : ${HOSTNAME:=${ZONENAME}.local}
-  : ${DOMAINNAME:=${HOSTNAME##*.}}
+  : ${HOSTNAME:=${ZONENAME}}
+  : ${DOMAINNAME:=local}
 
   [ ${RAM_IN_BYTES} ] || RAM_IN_BYTES=$( kstat -p -c zone_memory_cap -s physcap | awk '{print $2}' )
   [ ${RAM_IN_BYTES} -gt 0 2>/dev/null ] || RAM_IN_BYTES=134217728
diff --git a/zoneinit/includes/12-network.sh b/zoneinit/includes/12-network.sh
index ecdf99e..d3af54c 100644
--- a/zoneinit/includes/12-network.sh
+++ b/zoneinit/includes/12-network.sh
@@ -1,23 +1,18 @@
 log "setting hostname, IPs and resolvers"
 
-echo "${HOSTNAME}.${DOMAINNAME}" > /etc/nodename
-/bin/hostname ${HOSTNAME}.${DOMAINNAME}
+echo "${HOSTNAME}" > /etc/nodename
+/bin/hostname ${HOSTNAME}
 
 (
-echo "domain ${DOMAINNAME}"
-/bin/sed -E -e '/nameserver|domain/d' /etc/resolv.conf 2>/dev/null
+/bin/sed '/nameserver/d' /etc/resolv.conf 2>/dev/null
 for HOST in ${RESOLVERS[@]}; do
   echo "nameserver ${HOST}"
 done
 ) > /etc/resolv.conf.tmp
 mv /etc/resolv.conf{.tmp,}
 
-for IP in ${PUBLIC_IPS[@]}; do
-  echo "${IP}"$'\t'"${HOSTNAME}" >> /etc/inet/hosts
-done
-for IP in ${PRIVATE_IPS[@]}; do
-  echo "${IP}"$'\t'"${ZONENAME}"$'\t'"loghost" >> /etc/inet/hosts
-done
+sed '/^127\.0\.0\.1/s/$/ '${HOSTNAME}'/' /etc/inet/hosts > /etc/inet/hosts.tmp
+mv /etc/inet/hosts{.tmp,}
 
 log "checking if we can reach the Internets"