summaryrefslogtreecommitdiff
path: root/scripts/live
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2011-11-23 21:17:23 +0100
committerDaniel Baumann <daniel@debian.org>2011-11-24 09:42:09 +0100
commitf88546749c32ecf41bf31871507aa012af4e807b (patch)
tree61c98427a5d7b34a59de0cc7b989309352d26232 /scripts/live
parentf495b818c3f0007b2a89771ba82767302e2c033f (diff)
downloadlive-boot-f88546749c32ecf41bf31871507aa012af4e807b.tar.gz
live-boot-f88546749c32ecf41bf31871507aa012af4e807b.zip
Adding workaround for a busybox bug with grep -w.
See: https://bugs.busybox.net/show_bug.cgi?id=4520
Diffstat (limited to 'scripts/live')
-rwxr-xr-xscripts/live6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/live b/scripts/live
index ad481ae..1b5c89e 100755
--- a/scripts/live
+++ b/scripts/live
@@ -399,7 +399,7 @@ Arguments ()
then
PERSISTENT_ENCRYPTION="none"
export PERSISTENT_ENCRYPTION
- elif echo ${PERSISTENT_ENCRYPTION} | grep -qw luks
+ elif echo ${PERSISTENT_ENCRYPTION} | grep -qe "\<luks\>"
then
if ! modprobe dm-crypt
then
@@ -1403,12 +1403,12 @@ setup_unionfs ()
;;
esac
- if echo ${PERSISTENT_METHOD} | grep -qw overlay
+ if echo ${PERSISTENT_METHOD} | grep -qe "\<overlay\>"
then
overlays="${root_persistence} ${home_persistence}"
fi
- if echo ${PERSISTENT_METHOD} | grep -qw snapshot
+ if echo ${PERSISTENT_METHOD} | grep -qe "\<snapshot\>"
then
snapshots="${root_snapshot_label} ${home_snapshot_label}"
fi