diff options
| author | intrigeri <intrigeri@boum.org> | 2010-09-25 22:43:33 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:59:20 +0100 |
| commit | 6d73f92bf923d3f102f0bc1213c94b6227e804a0 (patch) | |
| tree | 37b43e4b7193160dd0f83e70b2550b1158d2bf1e /scripts | |
| parent | 9af1947f69cd9f320819da34c29c0e0bfa7d1c50 (diff) | |
| download | live-boot-6d73f92bf923d3f102f0bc1213c94b6227e804a0.tar.gz live-boot-6d73f92bf923d3f102f0bc1213c94b6227e804a0.zip | |
Fixing find_snap to take its second argument into account.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/live b/scripts/live index 18881af..ad2d48e 100755 --- a/scripts/live +++ b/scripts/live @@ -1005,16 +1005,17 @@ find_snap () { # Look for ${snap_label}.* in block devices snap_label="${1}" + black_listed_devices="${2}" if [ "${PERSISTENT}" != "nofiles" ] then # search for image files - snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2") + snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2" "${black_listed_devices}") fi if [ -z "${snapdata}" ] then - snapdata=$(find_cow_device "${snap_label}") + snapdata=$(find_cow_device "${snap_label}" "${black_listed_devices}") fi echo "${snapdata}" } |