X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-overlay.sh;h=db6a44ebf01aa6d40fade424c261f3e57ffb35a6;hb=41611e087d9be36c3eb8526e8cce715a47aca9ca;hp=58828f66524acca9655bc788b29c344a1ad081c3;hpb=396df49ea752a361a88ada9d180e3a58d9fa37a4;p=live-boot-grml.git

diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh
index 58828f6..db6a44e 100755
--- a/components/9990-overlay.sh
+++ b/components/9990-overlay.sh
@@ -110,7 +110,7 @@ setup_unionfs ()
 						;;
 				esac
 
-				mpoint="${croot}/${imagename}"
+				mpoint=$(trim_path "${croot}/${imagename}")
 				rootfslist="${mpoint} ${rootfslist}"
 
 				mkdir -p "${mpoint}"
@@ -240,12 +240,12 @@ setup_unionfs ()
 	then
 		cowdevice="tmpfs"
 		cow_fstype="tmpfs"
-		cow_mountopt="rw,noatime,mode=755"
+		cow_mountopt="rw,noatime,mode=755,size=${OVERLAY_SIZE:-50%}"
 	fi
 
 	if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
 	then
-		mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/live/overlay"
+		mount -t tmpfs -o rw,noatime,mode=755,size=${OVERLAY_SIZE:-50%} tmpfs "/live/overlay"
 		root_backing="/live/persistence/$(basename ${cowdevice})-root"
 		mkdir -p ${root_backing}
 	else
@@ -274,7 +274,7 @@ setup_unionfs ()
 			panic "only one RO file system supported with exposedroot: ${rootfslist}"
 		fi
 
-		mount --bind ${rootfs} ${rootmnt} || \
+		mount -o bind ${rootfs} ${rootmnt} || \
 			panic "bind mount of ${rootfs} failed"
 
 		if [ -z "${SKIP_UNION_MOUNTS}" ]
@@ -288,9 +288,9 @@ setup_unionfs ()
 	fi
 
 	for dir in ${cow_dirs}; do
-		unionmountpoint="${rootmnt}${dir}"
+		unionmountpoint=$(trim_path "${rootmnt}${dir}")
 		mkdir -p ${unionmountpoint}
-		cow_dir="/live/overlay${dir}"
+		cow_dir=$(trim_path "/live/overlay${dir}")
 		rootfs_dir="${rootfs}${dir}"
 		mkdir -p ${cow_dir}
 		if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]