From 8834e669dd00b5569fac107ec00481a1582396be Mon Sep 17 00:00:00 2001
From: Dmitry Nedospasov <dmitry@nedos.net>
Date: Wed, 23 Jun 2010 15:06:31 +0200
Subject: [PATCH] Correctly resolve the FQDN

* The FQDN *MUST* follow the hostname in /etc/hosts
* /etc/hostname need only contain the hostname
* Remove the 127.0.1.1 line for hosts with ips
---
 hooks/dapper/50-setup-hostname   | 10 ++++------
 hooks/debian/50-setup-hostname   | 10 ++++------
 hooks/edgy/50-setup-hostname     | 10 ++++------
 hooks/intrepid/50-setup-hostname | 10 ++++------
 hooks/karmic/50-setup-hostname   | 10 ++++------
 5 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/hooks/dapper/50-setup-hostname b/hooks/dapper/50-setup-hostname
index 800041b..4bb62a5 100755
--- a/hooks/dapper/50-setup-hostname
+++ b/hooks/dapper/50-setup-hostname
@@ -59,12 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -87,13 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
diff --git a/hooks/debian/50-setup-hostname b/hooks/debian/50-setup-hostname
index 800041b..4bb62a5 100755
--- a/hooks/debian/50-setup-hostname
+++ b/hooks/debian/50-setup-hostname
@@ -59,12 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -87,13 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
diff --git a/hooks/edgy/50-setup-hostname b/hooks/edgy/50-setup-hostname
index 800041b..4bb62a5 100755
--- a/hooks/edgy/50-setup-hostname
+++ b/hooks/edgy/50-setup-hostname
@@ -59,12 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -87,13 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
diff --git a/hooks/intrepid/50-setup-hostname b/hooks/intrepid/50-setup-hostname
index 800041b..4bb62a5 100755
--- a/hooks/intrepid/50-setup-hostname
+++ b/hooks/intrepid/50-setup-hostname
@@ -59,12 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -87,13 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
diff --git a/hooks/karmic/50-setup-hostname b/hooks/karmic/50-setup-hostname
index 800041b..4bb62a5 100755
--- a/hooks/karmic/50-setup-hostname
+++ b/hooks/karmic/50-setup-hostname
@@ -59,12 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -87,13 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.0.1	$GUEST_HOSTNAME
-${ip1}	$GUEST_FQDN
+${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_HOSTNAME $GUEST_FQDN
+127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi