[Debian-live-changes] r1327 - in dists/trunk/live-initramfs: conf doc scripts scripts/live-bottom

[Daniel Baumann]

Author: daniel
Date: 2007-05-06 15:33:33 +0000 (Sun, 06 May 2007)
New Revision: 1327

Modified:
   dists/trunk/live-initramfs/conf/live.conf
   dists/trunk/live-initramfs/doc/ChangeLog
   dists/trunk/live-initramfs/scripts/live
   dists/trunk/live-initramfs/scripts/live-bottom/18hostname
Log:


Modified: dists/trunk/live-initramfs/conf/live.conf
===================================================================
--- dists/trunk/live-initramfs/conf/live.conf	2007-05-06 15:09:34 UTC (rev 1326)
+++ dists/trunk/live-initramfs/conf/live.conf	2007-05-06 15:33:33 UTC (rev 1327)
@@ -4,6 +4,6 @@
 
 USERNAME="user"
 USERFULLNAME="Live session user"
-HOST="debian"
+HOSTNAME="debian"
 
-export BUILD_SYSTEM USERNAME USERFULLNAME HOST
+export BUILD_SYSTEM USERNAME USERFULLNAME HOSTNAME

Modified: dists/trunk/live-initramfs/doc/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 15:09:34 UTC (rev 1326)
+++ dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 15:33:33 UTC (rev 1327)
@@ -7,6 +7,8 @@
 	  - Added patch to support quickreboot.
 	* manpages/live-initramfs.7:
 	  - Added patch to add missing and new stuff.
+	* conf/live.conf, scripts/live, scripts/live-bottom/18hostname:
+	  - Added patch to rename $HOST to $HOSTNAME.
 
 2007-05-06  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-05-06 15:09:34 UTC (rev 1326)
+++ dists/trunk/live-initramfs/scripts/live	2007-05-06 15:33:33 UTC (rev 1327)
@@ -11,13 +11,13 @@
 
 USERNAME=user
 USERFULLNAME="Live session user"
-HOST=live
+HOSTNAME=live
 BUILD_SYSTEM=Custom
 
 mkdir -p $mountpoint
 
 [ -f /etc/live.conf ] && . /etc/live.conf
-export USERNAME USERFULLNAME HOST BUILD_SYSTEM
+export USERNAME USERFULLNAME HOSTNAME BUILD_SYSTEM
 
 . /scripts/live-helpers
 

Modified: dists/trunk/live-initramfs/scripts/live-bottom/18hostname
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/18hostname	2007-05-06 15:09:34 UTC (rev 1326)
+++ dists/trunk/live-initramfs/scripts/live-bottom/18hostname	2007-05-06 15:33:33 UTC (rev 1327)
@@ -20,10 +20,10 @@
 
 log_begin_msg "$DESCRIPTION"
 
-echo "$HOST" > /root/etc/hostname
+echo "$HOSTNAME" > /root/etc/hostname
 cat > /root/etc/hosts <<EOF
 127.0.0.1 localhost
-127.0.1.1 $HOST
+127.0.1.1 $HOSTNAME
 
 # The following lines are desirable for IPv6 capable hosts
 ::1     ip6-localhost ip6-loopback