From c00d324467314b6f4d6a1d6cc2d9a6ecfbd308cd Mon Sep 17 00:00:00 2001 From: Marco Amadori Date: Tue, 16 Sep 2008 17:26:09 +0200 Subject: Changed HOSTNAME and /etc/hosts handling. * This is one of a series of interventions that means to be gentle to debian-live builders and to persistence users; the rationale is that if a file is present on the rootfs it does not need to be overwritten from scratch since its presence means either a live-helper configuration at build time or a persistent/snapshot at run time. --- scripts/live-bottom/06hostname | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/live-bottom/06hostname b/scripts/live-bottom/06hostname index 29a080f..75ea801 100755 --- a/scripts/live-bottom/06hostname +++ b/scripts/live-bottom/06hostname @@ -31,9 +31,19 @@ log_begin_msg "Setting hostname" # live-initramfs script -echo "${HOSTNAME}" > /root/etc/hostname +# Change hostname only if it is not set +if [ ! -f /root/etc/hostname ] || grep -q localhost\.localdomain /root/etc/hostname +then + echo "${HOSTNAME}" > /root/etc/hostname +else + HOSTNAME="$(cat /root/etc/hostname)" + really_export HOSTNAME +fi -cat >> /root/etc/hosts << EOF +# Create /etc/hosts only if it is not present or empty +if [ ! -f /root/etc/hosts ] || [ "$(/root/usr/bin/stat -c %s root/etc/hosts)" == "0" ] +then + cat > /root/etc/hosts << EOF 127.0.0.1 localhost 127.0.1.1 ${HOSTNAME} @@ -45,6 +55,7 @@ ff02::1 ip6-allnodes ff02::2 ip6-allrouters ff02::3 ip6-allhosts EOF +fi hostname "${HOSTNAME}" -- cgit v1.2.3