[SCM] live-boot branch, debian-next, updated. debian/3.0_a12-1-2-gaa405f3

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit aa405f3d833cd4fcde2f028f48ba403dc0cad2e9
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Nov 27 14:05:16 2010 +0100

    Logging to /var/log/live-boot.log instead of /var/log/live.log for future consistency with live-config.

diff --git a/scripts/live b/scripts/live
index 1baf82e..90a9333 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1553,7 +1553,7 @@ check_dev ()
 
 		if [ "$ISO_DEVICE" = "/" ]
 		then
-			echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live.log
+			echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live-boot.log
 		else
 			mkdir /isofrom
 			mount -t auto "$ISO_DEVICE" /isofrom
@@ -1765,9 +1765,9 @@ mountroot ()
 
 	exec 6>&1
 	exec 7>&2
-	exec > live.log
+	exec > live-boot.log
 	exec 2>&1
-	tail -f live.log >&7 &
+	tail -f live-boot.log >&7 &
 	tailpid="${!}"
 
 	# Ensure 'panic' function is overridden
@@ -1927,5 +1927,5 @@ mountroot ()
 	exec 1>&6 6>&-
 	exec 2>&7 7>&-
 	kill ${tailpid}
-	[ -w "${rootmnt}/var/log/" ] && cp live.log "${rootmnt}/var/log/" 2>/dev/null
+	[ -w "${rootmnt}/var/log/" ] && cp live-boot.log "${rootmnt}/var/log/" 2>/dev/null
 }
diff --git a/scripts/live-functions b/scripts/live-functions
index 5efe432..f426ff9 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -76,7 +76,7 @@ panic() {
 	DEB_3="\033[1;31m\`. \`'\`  \033[0m"
 	DEB_4="\033[1;31m  \`-    \033[0m"
 
-	LIVELOG="\033[1;37m/live.log\033[0m"
+	LIVELOG="\033[1;37m/live-boot.log\033[0m"
 	DEBUG="\033[1;37mdebug\033[0m"
 
 	# Reset redirections to avoid buffering
diff --git a/scripts/live-helpers b/scripts/live-helpers
index b1883ff..06bd186 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -275,7 +275,7 @@ try_mount ()
 			fstype=$(get_fstype "${dev}")
 		fi
 		mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || \
-		( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > live.log && return 0 )
+		( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > live-boot.log && return 0 )
 	fi
 }
 

-- 
live-boot