From: Evgeni Golov <evgeni@grml.org>
Date: Mon, 11 Mar 2013 08:17:58 +0000 (+0100)
Subject: Fixing condition for setting rootfs_dest_backing.
X-Git-Tag: debian/4.0_a10-1~4
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=947290a2a0c11f6c37283b40d9b7a9ae89fc8a47

Fixing condition for setting rootfs_dest_backing.

The fix for the opt_link check in d5ed942 broke the code as it inverted the
meaning. Previously it ran the code iff opt_link was empty, as [ -n ] is
true. In the case opt_link was not empty, the code evaluated to [ -n foo],
which is invalid syntax and thus false. This, however, was almost the expected
behaviour, as rootfs_dest_backing is needed for opt_union and (in read-only
mode) for opt_link.
---

diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh
index cb3940b..fb7c644 100755
--- a/scripts/boot/9990-misc-helpers.sh
+++ b/scripts/boot/9990-misc-helpers.sh
@@ -1482,7 +1482,7 @@ activate_custom_mounts ()
 		# ignore the loop below and set rootfs_dest_backing=$dest
 		local rootfs_dest_backing
 		rootfs_dest_backing=""
-		if [ -n "${opt_link}" ]
+		if [ -n "${opt_link}" ] || [ -n "${opt_union}" ]
 		then
 			for d in /live/rootfs/*
 			do