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

2 files changed, 13 insertions, 13 deletions

diff --git a/scripts/live b/scripts/live
index 14165c1..62f7df5 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" ]
@@ -1245,9 +1245,9 @@ setup_unionfs ()
 		try_snap "${home_snapdata}" "${rootmnt}" "HOME" "/home"
 	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"
+	# shows cow fs on /overlay for use by live-snapshot
+	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 ()
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 889d157..9fea5a6 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -188,8 +188,8 @@ Arguments ()
 				export NFSOPTS
 				;;
 
-			nfscow=*)
-				NFS_COW="${ARGUMENT#nfscow=}"
+			nfsoverlay=*)
+				NFS_COW="${ARGUMENT#nfsoverlay=}"
 				export NFS_COW
 				;;
 
@@ -1502,11 +1502,11 @@ activate_custom_mounts ()
 			# be linked, causing breakage.
 			if [ -n "${rootmnt}" ]
 			then
-				local cow_dir="/cow/live/persistent/$(basename ${links_source})"
+				local cow_dir="/overlay/live/persistent/$(basename ${links_source})"
 			else
 				# This is happens if persistence is activated
 				# post boot
-				local cow_dir="/live/cow/live/persistent/$(basename ${links_source})"
+				local cow_dir="/live/overlay/live/persistent/$(basename ${links_source})"
 			fi
 			mkdir -p ${cow_dir}
 			chown_ref "${source}" "${cow_dir}"
@@ -1526,11 +1526,11 @@ activate_custom_mounts ()
 			# is non-empty (and necessary) only for unions
 			if [ -n "${rootmnt}" ]
 			then
-				local cow_dir="$(echo ${dest} | sed -e "s|^${rootmnt}|/cow/|")"
+				local cow_dir="$(echo ${dest} | sed -e "s|^${rootmnt}|/overlay/|")"
 			else
 				# This is happens if persistence is activated
 				# post boot
-				local cow_dir="/live/cow/${dest}"
+				local cow_dir="/live/overlay/${dest}"
 			fi
 			if [ -e "${cow_dir}" ] && [ -z "${opt_linkfiles}" ]
 			then