From 947290a2a0c11f6c37283b40d9b7a9ae89fc8a47 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 11 Mar 2013 09:17:58 +0100 Subject: [PATCH] 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. --- scripts/boot/9990-misc-helpers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.1.4