projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
698ae45
)
Fixing find_snap to take its second argument into account.
author
intrigeri
<intrigeri@boum.org>
Sat, 25 Sep 2010 20:43:33 +0000
(22:43 +0200)
committer
Daniel Baumann
<daniel@debian.org>
Sat, 25 Sep 2010 20:43:33 +0000
(22:43 +0200)
scripts/live
patch
|
blob
|
history
diff --git
a/scripts/live
b/scripts/live
index
0e1b2f4
..
f257218
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-944,16
+944,17
@@
find_snap ()
{
# Look for ${snap_label}.* in block devices
snap_label="${1}"
{
# Look for ${snap_label}.* in block devices
snap_label="${1}"
+ black_listed_devices="${2}"
if [ "${PERSISTENT}" != "nofiles" ]
then
# search for image files
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
fi
if [ -z "${snapdata}" ]
then
- snapdata=$(find_cow_device "${snap_label}")
+ snapdata=$(find_cow_device "${snap_label}"
"${black_listed_devices}"
)
fi
echo "${snapdata}"
}
fi
echo "${snapdata}"
}