[SCM] live-config branch, debian-old-2.0, updated. debian/2.0.4-1-6-g2a69a30

[Daniel Baumann]

The following commit has been merged in the debian-old-2.0 branch:
commit 2a69a30534d863257ee1f7bec674c6d28a3c2ba8
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Sep 6 01:26:57 2010 +0200

    Updating /etc/hosts handling in hostname config script for squeeze.

diff --git a/scripts/config/001-hostname b/scripts/config/001-hostname
index 80f41cb..872f6a3 100755
--- a/scripts/config/001-hostname
+++ b/scripts/config/001-hostname
@@ -37,16 +37,12 @@ Configure_hostname ()
 	then
 
 cat > /etc/hosts << EOF
-127.0.0.1 localhost
-127.0.1.1 ${LIVE_HOSTNAME}
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
+127.0.0.1       localhost ${LIVE_HOSTNAME}
+::1             localhost ip6-localhost ip6-loopback
+fe00::0         ip6-localnet
+ff00::0         ip6-mcastprefix
+ff02::1         ip6-allnodes
+ff02::2         ip6-allrouters
 EOF
 
 	fi

-- 
live-config