From 56dbf64940d862aee022347dc383f03b58fdea47 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 25 Sep 2010 22:43:33 +0200 Subject: [PATCH] Fixing find_snap to take its second argument into account. --- scripts/live | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/live b/scripts/live index 0e1b2f4..f257218 100755 --- a/scripts/live +++ b/scripts/live @@ -944,16 +944,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}" } -- 2.1.4