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

[Daniel Baumann]

Author: daniel
Date: 2007-05-11 11:23:49 +0000 (Fri, 11 May 2007)
New Revision: 1456

Added:
   dists/trunk/live-initramfs/scripts/live-bottom/00md5check
Removed:
   dists/trunk/live-initramfs/scripts/live-bottom/00integrity-check
Modified:
   dists/trunk/live-initramfs/scripts/live
   dists/trunk/live-initramfs/scripts/live-bottom/01live.conf
Log:


Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-05-11 10:45:35 UTC (rev 1455)
+++ dists/trunk/live-initramfs/scripts/live	2007-05-11 11:23:49 UTC (rev 1456)
@@ -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=} ;;
@@ -70,6 +70,8 @@
 		    STATICIP="frommedia"
 		fi
 		export STATICIP ;;
+	    integrity-check)
+	    	export MD5CHECK="Yes" ;;
 	    liver-getty)
 		export CASPERGETTY=1 ;;
 	    bootfrom=*|live-media=*)

Deleted: dists/trunk/live-initramfs/scripts/live-bottom/00integrity-check
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/00integrity-check	2007-05-11 10:45:35 UTC (rev 1455)
+++ dists/trunk/live-initramfs/scripts/live-bottom/00integrity-check	2007-05-11 11:23:49 UTC (rev 1456)
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# integrity-check
-
-grep integrity-check /proc/cmdline && live-md5check /live_media /live_media/md5sum.txt < /dev/tty8

Copied: dists/trunk/live-initramfs/scripts/live-bottom/00md5check (from rev 1455, dists/trunk/live-initramfs/scripts/live-bottom/00integrity-check)
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/00integrity-check	2007-05-11 10:45:35 UTC (rev 1455)
+++ dists/trunk/live-initramfs/scripts/live-bottom/00md5check	2007-05-11 11:23:49 UTC (rev 1456)
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+# initramfs-tools header
+
+PREREQ=""
+
+prereqs()
+{
+	echo "${PREREQ}"
+}
+
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
+esac
+
+# md5check script
+
+# Verifying md5sum.txt
+if [ -n "${MD5CHECK}" ]
+then
+	live-md5check /live_media /live_media/md5sum.txt < /dev/tty8
+fi

Modified: dists/trunk/live-initramfs/scripts/live-bottom/01live.conf
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/01live.conf	2007-05-11 10:45:35 UTC (rev 1455)
+++ dists/trunk/live-initramfs/scripts/live-bottom/01live.conf	2007-05-11 11:23:49 UTC (rev 1456)
@@ -18,28 +18,28 @@
 		;;
 esac
 
-# live.conf
+# live.conf script
 
 . /scripts/live-functions
 
-DESCRIPTION="Copying config on real root fs..."
+log_begin_msg "Copying config on real root fs..."
 
-log_begin_msg "${DESCRIPTION}"
-
 if [ -f /etc/live.conf ]
 then
-	if [ -n "${CASPERCONF}" ]
+	if [ -n "${LIVECONF}" ]
 	then
-		# Updating live.conf
+		# Updating existing live.conf with bootparameter values
 		sed -i	-e 's/\(USERNAME="\).*"/\1'"${USERNAME}"'"/g' \
 			-e 's/\(USERFULLNAME="\).*"/\1'"${USERFULLNAME}"'"/g' \
 			-e 's/\(HOSTNAME="\).*"/\1'"${HOSTNAME}"'"/g' \
 		/etc/live.conf
 	fi
 
+	# Copying already existing live.conf
 	cp -p /etc/live.conf /root/etc/live.conf
 else
 
+# Writing new live.conf with default values
 cat > /root/etc/live.conf << EOF
 export USERNAME="$USERNAME"
 export USERFULLNAME="$USERFULLNAME"