r2835 - in dists/trunk/live-initramfs: docs scripts scripts/live-bottom

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-09-05 10:37:36 +0000 (Wed, 05 Sep 2007)
New Revision: 2835

Modified:
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/scripts/live
   dists/trunk/live-initramfs/scripts/live-bottom/18hostname
Log:
Added nohosts parameter to disable /etc/hosts creation.

Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-09-05 05:44:11 UTC (rev 2834)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-09-05 10:37:36 UTC (rev 2835)
@@ -3,6 +3,7 @@
 	* scripts/live, scripts/live-bottom:
 	  - Added nouser parameter to disable user creation.
 	  - Added noxautoconfig parameter to disable xorg re-configuration.
+	  - Added nohosts parameter to disable /etc/hosts creation.
 	* scripts/live-bottom/15autologin:
 	  - Moved disabling of kpersonalizer to 34disable_kpersonalizer.
 

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-09-05 05:44:11 UTC (rev 2834)
+++ dists/trunk/live-initramfs/scripts/live	2007-09-05 10:37:36 UTC (rev 2835)
@@ -179,6 +179,11 @@
 				export NOFASTBOOT
 				;;
 
+			nohosts)
+				NOHOSTS="Yes"
+				export NOHOSTS
+				;;
+
 			nopersistent)
 				PERSISTENT=""
 				export PERSISTENT

Modified: dists/trunk/live-initramfs/scripts/live-bottom/18hostname
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/18hostname	2007-09-05 05:44:11 UTC (rev 2834)
+++ dists/trunk/live-initramfs/scripts/live-bottom/18hostname	2007-09-05 10:37:36 UTC (rev 2835)
@@ -20,6 +20,11 @@
 
 # live-initramfs header
 
+if [ -n "${NOHOSTS}" ]
+then
+        exit 0
+fi
+
 . /scripts/live-functions
 
 log_begin_msg "Setting hostname..."