X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F9990-overlay.sh;h=acb2e911d2f4b706a5c8743810a058109d28b791;hb=cd438f06901d6dbc2ca5c2be7dd3d5b03f4b7719;hp=00c53c89d98f4e06e8a5628a949d93d4fbcad7da;hpb=9dac5b65e0e6aaa9e194ec5e423476c78f6209e5;p=live-boot-grml.git

diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh
index 00c53c8..acb2e91 100755
--- a/scripts/boot/9990-overlay.sh
+++ b/scripts/boot/9990-overlay.sh
@@ -36,7 +36,7 @@ setup_unionfs ()
 	croot="/"
 
 	# Let's just mount the read-only file systems first
-	rofslist=""
+	rootfslist=""
 
 	if [ -z "${PLAIN_ROOT}" ]
 	then
@@ -101,7 +101,7 @@ setup_unionfs ()
 			if [ -d "${image}" ]
 			then
 				# it is a plain directory: do nothing
-				rofslist="${image} ${rofslist}"
+				rootfslist="${image} ${rootfslist}"
 			elif [ -f "${image}" ]
 			then
 				if losetup --help 2>&1 | grep -q -- "-r\b"
@@ -126,12 +126,12 @@ setup_unionfs ()
 				case "${UNIONTYPE}" in
 					unionmount)
 						mpoint="${rootmnt}"
-						rofslist="${rootmnt} ${rofslist}"
+						rootfslist="${rootmnt} ${rootfslist}"
 						;;
 
 					*)
 						mpoint="${croot}/${imagename}"
-						rofslist="${mpoint} ${rofslist}"
+						rootfslist="${mpoint} ${rootfslist}"
 						;;
 				esac
 
@@ -147,7 +147,7 @@ setup_unionfs ()
 		log_begin_msg "Mounting \"${image_directory}\" on \"${croot}/filesystem\""
 		mount -t $(get_fstype "${image_directory}") -o ro,noatime "${image_directory}" "${croot}/filesystem" || \
 			panic "Can not mount ${image_directory} on ${croot}/filesystem" && \
-			rofslist="${croot}/filesystem ${rofslist}"
+			rootfslist="${croot}/filesystem ${rootfslist}"
 		# probably broken:
 		mount -o bind ${croot}/filesystem $mountpoint
 		log_end_msg
@@ -289,19 +289,19 @@ setup_unionfs ()
 		fi
 	fi
 
-	rofscount=$(echo ${rofslist} |wc -w)
+	rootfscount=$(echo ${rootfslist} |wc -w)
 
-	rofs=${rofslist%% }
+	rootfs=${rootfslist%% }
 
 	if [ -n "${EXPOSED_ROOT}" ]
 	then
-		if [ ${rofscount} -ne 1 ]
+		if [ ${rootfscount} -ne 1 ]
 		then
-			panic "only one RO file system supported with exposedroot: ${rofslist}"
+			panic "only one RO file system supported with exposedroot: ${rootfslist}"
 		fi
 
-		mount --bind ${rofs} ${rootmnt} || \
-			panic "bind mount of ${rofs} failed"
+		mount --bind ${rootfs} ${rootmnt} || \
+			panic "bind mount of ${rootfs} failed"
 
 		if [ -z "${SKIP_UNION_MOUNTS}" ]
 		then
@@ -329,13 +329,13 @@ setup_unionfs ()
 			mount_full $unionmountopts "${unionmountpoint}"
 		else
 			cow_dir="/live/overlay${dir}"
-			rofs_dir="${rofs}${dir}"
+			rootfs_dir="${rootfs}${dir}"
 			mkdir -p ${cow_dir}
 			if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
 			then
-				do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rofs_dir}
+				do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rootfs_dir}
 			else
-				do_union ${unionmountpoint} ${cow_dir} ${rofs_dir}
+				do_union ${unionmountpoint} ${cow_dir} ${rootfs_dir}
 			fi
 		fi || panic "mount ${UNIONTYPE} on ${unionmountpoint} failed with option ${unionmountopts}"
 	done
@@ -343,36 +343,36 @@ setup_unionfs ()
 	# Correct the permissions of /:
 	chmod 0755 "${rootmnt}"
 
-	live_rofs_list=""
-	# SHOWMOUNTS is necessary for custom mounts with the union option
-	# Since we may want to do custom mounts in user-space it's best to always enable SHOWMOUNTS
-	if true #[ -n "${SHOWMOUNTS}" ] || ( [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ] 1)
+	# Correct the permission of /tmp:
+	if [ -d "${rootmnt}/tmp" ]
 	then
-		# XXX: is the for loop really necessary? rofslist can only contain one item (see above XXX about EXPOSEDROOT) and this is also assumed elsewhere above (see use of $rofs above).
-		for d in ${rofslist}
-		do
-			live_rofs="/live/rofs/${d##*/}"
-			live_rofs_list="${live_rofs_list} ${live_rofs}"
-			mkdir -p "${live_rofs}"
-			case d in
-				*.dir)
-					# do nothing # mount -o bind "${d}" "${live_rofs}"
-					;;
-				*)
-					case "${UNIONTYPE}" in
-						unionfs-fuse)
-							mount -o bind "${d}" "${live_rofs}"
-							;;
-
-						*)
-							mount -o move "${d}" "${live_rofs}"
-							;;
-					esac
-					;;
-			esac
-		done
+		chmod 1777 "${rootmnt}"/tmp
 	fi
 
+	live_rootfs_list=""
+	for d in ${rootfslist}
+	do
+		live_rootfs="/live/rootfs/${d##*/}"
+		live_rootfs_list="${live_rootfs_list} ${live_rootfs}"
+		mkdir -p "${live_rootfs}"
+		case d in
+			*.dir)
+				# do nothing # mount -o bind "${d}" "${live_rootfs}"
+				;;
+			*)
+				case "${UNIONTYPE}" in
+					unionfs-fuse)
+						mount -o bind "${d}" "${live_rootfs}"
+						;;
+
+					*)
+						mount -o move "${d}" "${live_rootfs}"
+						;;
+				esac
+				;;
+		esac
+	done
+
 	# Adding custom persistence
 	if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ]
 	then
@@ -399,11 +399,30 @@ setup_unionfs ()
 		done
 	fi
 
-	mkdir -p "${rootmnt}/live"
-	mount -o move /live "${rootmnt}/live" >/dev/null 2>&1 || mount -o bind /live "${rootmnt}/live" || log_warning_msg "Unable to move or bind /live to ${rootmnt}/live"
+	# move all mountpoints to root filesystem
+	for _DIRECTORY in rootfs persistence
+	do
+		if [ -d "/live/${_DIRECTORY}" ]
+		then
+			mkdir -p "${rootmnt}/lib/live/mount/${_DIRECTORY}"
+
+			for _MOUNT in $(ls /live/${_DIRECTORY})
+			do
+				mkdir -p "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}"
+				mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \
+					mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" || \
+					log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}"
+			done
+		fi
+	done
 
-	# shows cow fs on /overlay (FIXME: do we still need/want this? probably yes)
-	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 "Unable to move or bind /overlay to ${rootmnt}/live/overlay"
+	mkdir -p "${rootmnt}/lib/live/mount/overlay"
+	mount -o move /live/overlay "${rootmnt}/lib/live/mount/overlay" > /dev/null 2>&1 || \
+		mount -o bind /live/overlay "${rootmnt}/lib/live/mount/overlay" || \
+		log_warning_msg "W: failed to mount /live/overlay to ${rootmnt}/lib/live/mount/overlay"
 
+        # ensure that a potentially stray tmpfs gets removed
+        # otherways, initramfs-tools is unable to remove /live
+        # and fails to boot
+        umount /live/overlay || true
 }