[Pkg-uml-commit] r227 - in trunk/src/rootstrap: debian modules

[Stefano Melchior]

Author: stex-guest
Date: 2006-10-04 08:38:50 +0000 (Wed, 04 Oct 2006)
New Revision: 227

Modified:
   trunk/src/rootstrap/debian/changelog
   trunk/src/rootstrap/modules/network
Log:
removed amd64 entry in changelog; added uml ip, hostname and domain in /etc/hosts for #388076

Modified: trunk/src/rootstrap/debian/changelog
===================================================================
--- trunk/src/rootstrap/debian/changelog	2006-10-03 18:47:11 UTC (rev 226)
+++ trunk/src/rootstrap/debian/changelog	2006-10-04 08:38:50 UTC (rev 227)
@@ -1,6 +1,6 @@
 rootstrap (0.3.24-1) unstable; urgency=low
 
-  * add amd64 architecture, build and unstable rootfs image creation tested.
+  * add uml IP, hostname and domain in /etc/hosts (Closes: #388076)
   * correctly write the timezone file in the guest FS (Closes: #388055)
   * try to print descriptive error messages when a module fails
     (Closes: #388061)

Modified: trunk/src/rootstrap/modules/network
===================================================================
--- trunk/src/rootstrap/modules/network	2006-10-03 18:47:11 UTC (rev 226)
+++ trunk/src/rootstrap/modules/network	2006-10-04 08:38:50 UTC (rev 227)
@@ -22,16 +22,20 @@
 echo "netmask=$netmask" >> $CONF
 echo "gateway=$gateway" >> $CONF
 
+echo "127.0.0.1  localhost " > /etc/hosts
+
+if [ -z "$hostname" ]; then
+  hostname=rootstrap
+fi
+
+hostname "$hostname"
+
 if test -n "$domain"; then
     echo "domain $domain" > /etc/resolv.conf
+    echo "$uml $hostname.$domain $hostname" >> /etc/hosts
 fi
 
 if test -n "$nameserver"; then
     echo "nameserver $nameserver" >> /etc/resolv.conf
 fi
 
-if [ -z "$hostname" ]; then
-  hostname=rootstrap
-fi
-hostname "$hostname"
-echo "127.0.0.1  localhost $hostname.$domain $hostname" > /etc/hosts