Adding upstream version 1.118.1.

[live-boot-grml.git] / scripts / live-bottom / 18hostname

diff --git a/scripts/live-bottom/18hostname b/scripts/live-bottom/18hostname
index 430d0a0..446bc23 100755 (executable)
--- a/scripts/live-bottom/18hostname
+++ b/scripts/live-bottom/18hostname
@@ -20,16 +20,22 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOHOSTS}" ]
+then
+        exit 0
+fi
+
 . /scripts/live-functions
 
 log_begin_msg "Setting hostname..."
 
 # live-initramfs script
 
-echo "$HOSTNAME" > /root/etc/hostname
-cat >> /root/etc/hosts <<EOF
+echo "${HOSTNAME}" > /root/etc/hostname
+
+cat >> /root/etc/hosts << EOF
 127.0.0.1 localhost
-127.0.1.1 $HOSTNAME
+127.0.1.1 ${HOSTNAME}
 
 # The following lines are desirable for IPv6 capable hosts
 ::1     ip6-localhost ip6-loopback
@@ -38,7 +44,8 @@ ff00::0 ip6-mcastprefix
 ff02::1 ip6-allnodes
 ff02::2 ip6-allrouters
 ff02::3 ip6-allhosts
-
 EOF
 
+hostname "${HOSTNAME}"
+
 log_end_msg