[Debian-live-changes] r1498 - in dists/trunk/live-initramfs: docs scripts scripts/live-bottom

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-16 07:04:35 +0000 (Wed, 16 May 2007)
New Revision: 1498

Modified:
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/scripts/live
   dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf
   dists/trunk/live-initramfs/scripts/live-bottom/25configure_init
Log:


Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-05-16 06:56:05 UTC (rev 1497)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-05-16 07:04:35 UTC (rev 1498)
@@ -1,6 +1,8 @@
 2007-05-12  Daniel Baumann  <daniel at debian.org>
 
 	* scripts/live:
+	  - Renamed CASPERCONF to LIVECONF.
+	  - Renamed CASPERGETTY to LIVE_GETTY.
 	  - Renamed LIVEMEDIA_* to LIVE_MEDIA_*.
 
 2007-05-11  Daniel Baumann  <daniel at debian.org>

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-05-16 06:56:05 UTC (rev 1497)
+++ dists/trunk/live-initramfs/scripts/live	2007-05-16 07:04:35 UTC (rev 1498)
@@ -38,15 +38,15 @@
         case $x in
             userfullname=*)
                 export USERFULLNAME=${x#userfullname=}
-                export CASPERCONF="changed"
+                export LIVECONF="changed"
                 ;;
             hostname=*)
                 export HOSTNAME=${x#hostname=}
-                export CASPERCONF="changed"
+                export LIVECONF="changed"
                 ;;
             username=*)
                 export USERNAME=${x#username=}
-                export CASPERCONF="changed"
+                export LIVECONF="changed"
                 ;;
             netboot*)
                 export NETBOOT=${x#netboot=} ;;
@@ -75,7 +75,7 @@
                 fi
                 export STATICIP ;;
             live-getty)
-                export CASPERGETTY=1 ;;
+                export LIVE_GETTY=1 ;;
             bootfrom=*|live-media=*)
                 export LIVE_MEDIA=${x#*=} ;;
             live-media-encryption=*|encryption=*)

Modified: dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf	2007-05-16 06:56:05 UTC (rev 1497)
+++ dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf	2007-05-16 07:04:35 UTC (rev 1498)
@@ -21,7 +21,7 @@
 log_begin_msg "$DESCRIPTION"
 
 if [ -f /etc/live.conf ] ; then
-       if [ ! -z "${CASPERCONF}" ]; then
+       if [ ! -z "${LIVECONF}" ]; then
                # Updating live.conf
                sed -i -e 's/\(USERNAME="\).*"/\1'"${USERNAME}"'"/g' \
                    -e 's/\(USERFULLNAME="\).*"/\1'"${USERFULLNAME}"'"/g' \

Modified: dists/trunk/live-initramfs/scripts/live-bottom/25configure_init
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/25configure_init	2007-05-16 06:56:05 UTC (rev 1497)
+++ dists/trunk/live-initramfs/scripts/live-bottom/25configure_init	2007-05-16 07:04:35 UTC (rev 1498)
@@ -23,7 +23,7 @@
 # Arrange for shells on virtual consoles, rather than login prompts
 
 if [ -n "$USERNAME" ]; then
-    if [ ! -z "${CASPERGETTY}" ]; then
+    if [ ! -z "${LIVE_GETTY}" ]; then
        if echo "${DEFCONSOLE}" | grep -qs ttyS; then
             # AUTOMATIC SERIAL CONSOLE #
             PORT=$(echo "${DEFCONSOLE}" | \
@@ -42,12 +42,12 @@
                         fi
                     done
                 done
-                echo "${ID}:2345:respawn:/sbin/casper-getty -L ${PORT} ${SPEED} vt100" \
+                echo "${ID}:2345:respawn:/sbin/live-getty -L ${PORT} ${SPEED} vt100" \
                 >>/root/etc/inittab
             fi
         fi
         if [ -f /root/etc/inittab ]; then
-             sed -i -e'/^[^#]/s%respawn:/sbin/getty%respawn:/sbin/casper-getty%' /root/etc/inittab
+             sed -i -e'/^[^#]/s%respawn:/sbin/getty%respawn:/sbin/live-getty%' /root/etc/inittab
         fi
     else
         if [ -f /root/etc/inittab ]; then