[SCM] live-boot branch, tmp-persistent, updated. debian/3.0_a26-1-8-gd13dc92

[Daniel Baumann]

The following commit has been merged in the tmp-persistent branch:
commit d13dc9251bd559797ecaad24fcb422748faffacb
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Apr 8 17:47:57 2012 +0200

    Renaming /live/cow to /live/overlay in anticipation of overlayfs.

diff --git a/scripts/live b/scripts/live
index 14165c1..8a0b700 100755
--- a/scripts/live
+++ b/scripts/live
@@ -952,7 +952,7 @@ setup_unionfs ()
 		log_end_msg
 	fi
 
-	mkdir -p /cow
+	mkdir -p /overlay
 
 	# Looking for persistent devices or files
 	if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
@@ -1106,11 +1106,11 @@ setup_unionfs ()
 	then
 		if [ -n "${PERSISTENT_READONLY}" ]
 		then
-			mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/cow"
+			mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/overlay"
 			root_backing="${rootmnt}/live/persistent/$(basename ${cowdevice})-root"
 			mkdir -p ${root_backing}
 		else
-			root_backing="/cow"
+			root_backing="/overlay"
 		fi
 
 		if [ "${cow_fstype}" = "nfs" ]
@@ -1164,7 +1164,7 @@ setup_unionfs ()
 			unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}"
 			mount_full $unionmountopts "${unionmountpoint}"
 		else
-			cow_dir="/cow${dir}"
+			cow_dir="/overlay${dir}"
 			rofs_dir="${rofs}${dir}"
 			mkdir -p ${cow_dir}
 			if [ -n "${PERSISTENT_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
@@ -1246,8 +1246,8 @@ setup_unionfs ()
 	fi
 
 	# shows cow fs on /cow for use by live-snapshot
-	mkdir -p "${rootmnt}/live/cow"
-	mount -o move /cow "${rootmnt}/live/cow" >/dev/null 2>&1 || mount -o bind /cow "${rootmnt}/live/cow" || log_warning_msg "Unable to move or bind /cow to ${rootmnt}/live/cow"
+	mkdir -p "${rootmnt}/live/overlay"
+	mount -o move /overlay "${rootmnt}/live/overlay" >/dev/null 2>&1 || mount -o bind /overlay "${rootmnt}/live/overlay" || log_warning_msg "Unable to move or bind /overlay to ${rootmnt}/live/overlay"
 }
 
 check_dev ()

-- 
live-boot