X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F18hostname;h=446bc2357c1fe21495dc602dd92dc5839d3ae564;hb=c303d09e10ef3774540af4b91d0f25bf8f3c1981;hp=430d0a00599a6b5857035f22971bdac59fef2179;hpb=53d6aa07a26b3613d3d3f3e21b3b9e9b8b2b0917;p=live-boot-grml.git diff --git a/scripts/live-bottom/18hostname b/scripts/live-bottom/18hostname index 430d0a0..446bc23 100755 --- 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 < /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