Moving remaining stuff from /live to /lib/live to avoid further namespace pollution.

3 files changed, 21 insertions, 22 deletions

diff --git a/scripts/boot.sh b/scripts/boot.sh
index 11e8094..67585f9 100755
--- a/scripts/boot.sh
+++ b/scripts/boot.sh
@@ -3,8 +3,7 @@
 # set -e
 
 # Reading configuration file from filesystem and live-media
-for _FILE in /etc/live/boot.conf /etc/live/boot/* \
-	     /live/image/live/boot.conf /live/image/live/boot/*
+for _FILE in /etc/live/boot.conf /etc/live/boot/*
 do
 	if [ -e "${_FILE}" ]
 	then
diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index ba77dd4..ef41fb0 100755
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -132,7 +132,7 @@ Main ()
 
 	if [ -n "${ROOT_PID}" ]
 	then
-		echo "${ROOT_PID}" > "${rootmnt}"/live/root.pid
+		echo "${ROOT_PID}" > "${rootmnt}"/lib/live/root.pid
 	fi
 
 	log_end_msg
@@ -146,8 +146,8 @@ Main ()
 	esac
 
 	# Move to the new root filesystem so that programs there can get at it.
-	mkdir -p /root/live/image
-	mount --move /live/image /root/live/image
+	mkdir -p /root/lib/live/image
+	mount --move /live/image /root/lib/live/image
 
 	# aufs2 in kernel versions around 2.6.33 has a regression:
 	# directories can't be accessed when read for the first the time,
@@ -158,8 +158,8 @@ Main ()
 	# Move findiso directory to the new root filesystem so that programs there can get at it.
 	if [ -d /live/findiso ]
 	then
-		mkdir -p /root/live/findiso
-		mount -n --move /live/findiso /root/live/findiso
+		mkdir -p /root/lib/live/findiso
+		mount -n --move /live/findiso /root/lib/live/findiso
 	fi
 
 	# if we do not unmount the ISO we can't run "fsck /dev/ice" later on
@@ -169,10 +169,10 @@ Main ()
 	then
 		losetup -d /dev/loop0
 
-		if is_mountpoint /root/live/findiso
+		if is_mountpoint /root/lib/live/findiso
 		then
-			umount /root/live/findiso
-			rmdir --ignore-fail-on-non-empty /root/live/findiso \
+			umount /root/lib/live/findiso
+			rmdir --ignore-fail-on-non-empty /root/lib/live/findiso \
 				>/dev/null 2>&1 || true
 		fi
 	fi
diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh
index d377d34..8283c73 100755
--- a/scripts/boot/9990-overlay.sh
+++ b/scripts/boot/9990-overlay.sh
@@ -405,30 +405,30 @@ setup_unionfs ()
 		done
 	fi
 
-	# make /root/live writable for moving filesystems
-	mkdir -p "${rootmnt}/live"
-	mount -t tmpfs tmpfs "${rootmnt}/live"
+	# make /root/lib/live writable for moving filesystems
+	mkdir -p "${rootmnt}/lib/live"
+	mount -t tmpfs tmpfs "${rootmnt}/lib/live"
 
 	# move all mountpoints to root filesystem
 	for _DIRECTORY in rofs persistence
 	do
 		if [ -d "/live/${_DIRECTORY}" ]
 		then
-			mkdir -p "${rootmnt}/live/${_DIRECTORY}"
+			mkdir -p "${rootmnt}/lib/live/${_DIRECTORY}"
 
 			for _MOUNT in $(ls /live/${_DIRECTORY})
 			do
-				mkdir -p "${rootmnt}/live/${_DIRECTORY}/${_MOUNT}"
-				mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/live/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \
-					mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/live/${_DIRECTORY}/${_MOUNT}" || \
-					log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/live/${_DIRECTORY}/${_MOUNT}"
+				mkdir -p "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}"
+				mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \
+					mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" || \
+					log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}"
 			done
 		fi
 	done
 
-	mkdir -p "${rootmnt}/live/overlay"
-	mount -o move /live/overlay "${rootmnt}/live/overlay" > /dev/null 2>&1 || \
-		mount -o bind /overlay "${rootmnt}/live/overlay" || \
-		log_warning_msg "W: failed to mount /overlay to ${rootmnt}/live/overlay"
+	mkdir -p "${rootmnt}/lib/live/overlay"
+	mount -o move /live/overlay "${rootmnt}/lib/live/overlay" > /dev/null 2>&1 || \
+		mount -o bind /live/overlay "${rootmnt}/lib/live/overlay" || \
+		log_warning_msg "W: failed to mount /live/overlay to ${rootmnt}/lib/live/overlay"
 
 }