diff options
| author | Evgeni Golov <evgeni@grml.org> | 2013-03-11 09:17:58 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 13:54:16 +0200 |
| commit | 947290a2a0c11f6c37283b40d9b7a9ae89fc8a47 (patch) | |
| tree | 674d2881a816ae2982d7ff25b6579884f5140242 | |
| parent | bcb91e3cacfe5375539e0becba9421a9c8c53c5d (diff) | |
| download | live-boot-947290a2a0c11f6c37283b40d9b7a9ae89fc8a47.tar.gz live-boot-947290a2a0c11f6c37283b40d9b7a9ae89fc8a47.zip | |
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.
| -rwxr-xr-x | scripts/boot/9990-misc-helpers.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |