diff options
| author | Tails developers <amnesia@boum.org> | 2011-11-23 21:17:23 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-11-24 09:42:09 +0100 |
| commit | f88546749c32ecf41bf31871507aa012af4e807b (patch) | |
| tree | 61c98427a5d7b34a59de0cc7b989309352d26232 /scripts | |
| parent | f495b818c3f0007b2a89771ba82767302e2c033f (diff) | |
| download | live-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')
| -rwxr-xr-x | scripts/live | 6 | ||||
| -rw-r--r-- | scripts/live-helpers | 14 |
2 files changed, 10 insertions, 10 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 diff --git a/scripts/live-helpers b/scripts/live-helpers index 976189a..3109356 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -46,9 +46,9 @@ storage_devices() do fulldevname=$(sys2dev "${sysblock}") - if echo "${black_listed_devices}" | grep -qw "${fulldevname}" || \ + if echo "${black_listed_devices}" | grep -qe "\<${fulldevname}\>" || \ [ -n "${white_listed_devices}" ] && \ - echo "${white_listed_devices}" | grep -vqw "${fulldevname}" + echo "${white_listed_devices}" | grep -qve "\<${fulldevname}\>" then # skip this device entirely continue @@ -58,7 +58,7 @@ storage_devices() do devname=$(sys2dev "${dev}") - if echo "${black_listed_devices}" | grep -qw "${devname}" + if echo "${black_listed_devices}" | grep -qe "\<${devname}\>" then # skip this subdevice continue @@ -379,7 +379,7 @@ find_persistent_media () luks_device="" # Checking for a luks device - if echo ${PERSISTENT_ENCRYPTION} | grep -qw luks && \ + if echo ${PERSISTENT_ENCRYPTION} | grep -qe "\<luks\>" && \ /sbin/cryptsetup isLuks ${dev} then if luks_device=$(open_luks_device "${dev}") @@ -389,13 +389,13 @@ find_persistent_media () # skip $dev since we failed/chose not to open it continue fi - elif echo ${PERSISTENT_ENCRYPTION} | grep -qwv none + elif echo ${PERSISTENT_ENCRYPTION} | grep -qve "\<none\>" then # skip $dev since we don't allow unencrypted storage continue fi - if echo ${PERSISTENT_STORAGE} | grep -qw filesystem + if echo ${PERSISTENT_STORAGE} | grep -qe "\<filesystem\>" then for label in ${overlays} ${snapshots} do @@ -410,7 +410,7 @@ find_persistent_media () done fi - if echo ${PERSISTENT_STORAGE} | grep -qw file + if echo ${PERSISTENT_STORAGE} | grep -qe "\<file\>" then devfstype="$(get_fstype ${dev})" overlay_on_dev="" |