From: Ronny Standtke <ronny.standtke@gmx.net>
Date: Tue, 21 Nov 2017 14:27:09 +0000 (+0100)
Subject: Fix read-only persistence mode with overlayfs
X-Git-Tag: debian/1%20180328~32
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=4574758abec5d6f661742567c14a89c240ccd0b3

Fix read-only persistence mode with overlayfs

Thanks to Ronny Standtke <ronny.standtke@fhnw.ch> for the patch.

Closes: #877776
---

diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index ee53b16..fba3d43 100755
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -1615,6 +1615,13 @@ activate_custom_mounts ()
 			mkdir -p ${cow_dir}
 			chown_ref "${source}" "${cow_dir}"
 			chmod_ref "${source}" "${cow_dir}"
+			if [ "${UNIONTYPE}" = "overlay" ]
+			then
+				# When we use overlay we add the "/rw" postfix to our source when using it
+				# as upper layer. Therefore we also have to add it here when using it as
+				# the lower layer.
+				source="${source}/rw"
+			fi
 			do_union ${dest} ${cow_dir} ${source} ${rootfs_dest_backing}
 		fi
 
diff --git a/debian/changelog b/debian/changelog
index 4c4c363..2248f3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+live-boot (1:20171121) UNRELEASED; urgency=medium
+
+  * Fix read-only persistence mode with overlayfs. Closes: #877776
+    Thanks to Ronny Standtke <ronny.standtke@fhnw.ch> for the patch.
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Tue, 21 Nov 2017 15:27:37 +0100
+
 live-boot (1:20170623) unstable; urgency=medium
 
   * Do not duplicate files in /lib/live/boot/ and /bin/boot/ in the initrd.