[Debian-live-changes] r1471 - in dists/trunk/live-initramfs/scripts: . live-bottom

[Daniel Baumann]

Author: daniel
Date: 2007-05-11 19:28:19 +0000 (Fri, 11 May 2007)
New Revision: 1471

Modified:
   dists/trunk/live-initramfs/scripts/live
   dists/trunk/live-initramfs/scripts/live-bottom/25configure_init
Log:


Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-05-11 19:25:56 UTC (rev 1470)
+++ dists/trunk/live-initramfs/scripts/live	2007-05-11 19:28:19 UTC (rev 1471)
@@ -104,28 +104,28 @@
 				;;
 
 			live-getty)
-				LIVEGETTY="1"
-				export LIVEGETTY
+				LIVE_GETTY="1"
+				export LIVE_GETTY
 				;;
 
 			live-media=*|bootfrom=*)
-				LIVEMEDIA="`echo ${PARAMETER} | sed 's/.*=//'`"
-				export LIVEMEDIA
+				LIVE_MEDIA="`echo ${PARAMETER} | sed 's/.*=//'`"
+				export LIVE_MEDIA
 				;;
 
 			live-media-encryption=*|encryption=*)
-				LIVEMEDIA_ENCRYPTION="`echo ${PARAMETER} | sed 's/.*=//'`"
-				export LIVEMEDIA_ENCRYPTION
+				LIVE_MEDIA_ENCRYPTION="`echo ${PARAMETER} | sed 's/.*=//'`"
+				export LIVE_MEDIA_ENCRYPTION
 				;;
 
 			live-media-timeout=*)
-				LIVEMEDIA_TIMEOUT="`echo ${PARAMETER} | sed 's/.*=//'`"
-				export LIVEMEDIA_TIMEOUT
+				LIVE_MEDIA_TIMEOUT="`echo ${PARAMETER} | sed 's/.*=//'`"
+				export LIVE_MEDIA_TIMEOUT
 				;;
 
 			live-media-offset=*)
-				LIVEMEDIA_OFFSET="`echo ${PARAMETER} | sed 's/.*=//'`"
-				export LIVEMEDIA_OFFSET
+				LIVE_MEDIA_OFFSET="`echo ${PARAMETER} | sed 's/.*=//'`"
+				export LIVE_MEDIA_OFFSET
 				;;
 
 			locale=*|debian-installer/locale=*)
@@ -233,7 +233,7 @@
 get_backing_device() {
     case "$1" in
         *.squashfs|*.ext2)
-            echo $(setup_loop "$1" "loop" "/sys/block/loop*" '0' "${LIVEMEDIA_ENCRYPTION}")
+            echo $(setup_loop "$1" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}")
             ;;
         *.dir)
             echo "directory"
@@ -611,8 +611,8 @@
         devname=$(sys2dev "${sysdev}")
     fi
 
-    if [ -n "${LIVEMEDIA_OFFSET}" ]; then
-        loopdevname=$(setup_loop "${devname}" "loop" "/sys/block/loop*" "${LIVEMEDIA_OFFSET}" '')
+    if [ -n "${LIVE_MEDIA_OFFSET}" ]; then
+        loopdevname=$(setup_loop "${devname}" "loop" "/sys/block/loop*" "${LIVE_MEDIA_OFFSET}" '')
         devname="${loopdevname}"
     fi
 
@@ -627,7 +627,7 @@
         fi
     fi
 
-    if [ -n "${LIVEMEDIA_OFFSET}" ]; then
+    if [ -n "${LIVE_MEDIA_OFFSET}" ]; then
         losetup -d "${loopdevname}"
     fi
     return 1
@@ -636,14 +636,14 @@
 find_livefs() {
     timeout="${1}"
     # first look at the one specified in the command line
-    if [ ! -z "${LIVEMEDIA}" ]; then
-        if check_dev "null" "${LIVEMEDIA}"; then
+    if [ ! -z "${LIVE_MEDIA}" ]; then
+        if check_dev "null" "${LIVE_MEDIA}"; then
             return 0
         fi
     fi
     # don't start autodetection before timeout has expired
-    if [ -n "${LIVEMEDIA_TIMEOUT}" ]; then
-        if [ "${timeout}" -lt "${LIVEMEDIA_TIMEOUT}" ]; then
+    if [ -n "${LIVE_MEDIA_TIMEOUT}" ]; then
+        if [ "${timeout}" -lt "${LIVE_MEDIA_TIMEOUT}" ]; then
             return 1
         fi
     fi

Modified: dists/trunk/live-initramfs/scripts/live-bottom/25configure_init
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/25configure_init	2007-05-11 19:25:56 UTC (rev 1470)
+++ dists/trunk/live-initramfs/scripts/live-bottom/25configure_init	2007-05-11 19:28:19 UTC (rev 1471)
@@ -30,7 +30,7 @@
 
 if [ -n "$USERNAME" ]
 then
-	if [ -n "${LIVEGETTY}" ]
+	if [ -n "${LIVE_GETTY}" ]
 	then
 		if echo "${DEFCONSOLE}" | grep -qs ttyS
 		then