From: Benjamin Drung <benjamin.drung@profitbricks.com>
Date: Fri, 22 Dec 2017 18:03:58 +0000 (+0100)
Subject: Avoid double slashes in some paths
X-Git-Tag: debian/1%20180328~28
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=88b331d874c6be184e708b69c7a8c0ceddb5a5ee

Avoid double slashes in some paths

Closes: #885453
---

diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh
index d1b9cef..8fd0cfd 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}"
@@ -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" ]