diff options
| author | Tails developers <amnesia@boum.org> | 2010-11-01 17:35:45 +0100 |
|---|---|---|
| committer | Tails developers <amnesia@boum.org> | 2011-09-07 14:53:41 +0200 |
| commit | 209828c38d8af6fa2eab68cd668ca9109261f249 (patch) | |
| tree | e1bfa5e39906673ae2971b1e02a7a8de0cd4f44a /scripts/live | |
| parent | a8ee91a515eb774deb072cdc3b0c2c7591b7d7f6 (diff) | |
| download | live-boot-209828c38d8af6fa2eab68cd668ca9109261f249.tar.gz live-boot-209828c38d8af6fa2eab68cd668ca9109261f249.zip | |
Adding a white_listed_devices parameter to find_cow_device and find_files.
This will be needed for the upcoming persistent-media={removable,removable-usb}
boot option.
Diffstat (limited to 'scripts/live')
| -rwxr-xr-x | scripts/live | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/live b/scripts/live index 82f5413..de82082 100755 --- a/scripts/live +++ b/scripts/live @@ -1033,16 +1033,17 @@ find_snap () # Look for ${snap_label}.* in block devices snap_label="${1}" black_listed_devices="${2}" + white_listed_devices="${3}" 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" "${black_listed_devices}") + 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}" "${white_listed_devices}") fi if [ -z "${snapdata}" ] then - snapdata=$(find_cow_device "${snap_label}" "${black_listed_devices}") + snapdata=$(find_cow_device "${snap_label}" "${black_listed_devices}" "${white_listed_devices}") fi echo "${snapdata}" } @@ -1351,7 +1352,7 @@ setup_unionfs () fi # search for label and files (this could be hugely optimized) - cowprobe=$(find_cow_device "${root_persistence}") + cowprobe=$(find_cow_device "${root_persistence}" "${blacklistdev}" "${whitelistdev}") if [ -b "${cowprobe}" ] then # Blacklist /cow device, to avoid inconsistent setups for overlapping snapshots @@ -1363,17 +1364,17 @@ setup_unionfs () export PERSISTENCE_IS_ON fi # homecow just mount something on /home, this should be generalized some way - homecow=$(find_cow_device "${home_persistence}" "${blacklistdev}") + homecow=$(find_cow_device "${home_persistence}" "${blacklistdev}" "${whitelistdev}") if [ -b "${homecow}" ] then PERSISTENCE_IS_ON="1" export PERSISTENCE_IS_ON fi - root_snapdata=$(find_snap "${root_snapshot_label}" "${blacklistdev}") + root_snapdata=$(find_snap "${root_snapshot_label}" "${blacklistdev}" "${whitelistdev}") # This second type should be removed when snapshot will get smarter, # hence when "/etc/live-snapshot*list" will be supported also by # ext2|ext3|ext4|jffs2 snapshot types. - home_snapdata=$(find_snap "${home_snapshot_label}" "${blacklistdev}") + home_snapdata=$(find_snap "${home_snapshot_label}" "${blacklistdev}" "${whitelistdev}") if [ -b "${cowprobe}" ] then |