diff options
| author | Tails developers <amnesia@boum.org> | 2012-02-11 21:27:48 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-04-01 22:13:28 +0200 |
| commit | e2d2d40b67bdbbef25f1b53f4fbc2eedc72f12cd (patch) | |
| tree | 5d94835ab172028283b19ca7963e5c7d7ceb0e6f /scripts/live-helpers | |
| parent | 931f580302ca3a121d3be602a49e732d5189b667 (diff) | |
| download | live-boot-e2d2d40b67bdbbef25f1b53f4fbc2eedc72f12cd.tar.gz live-boot-e2d2d40b67bdbbef25f1b53f4fbc2eedc72f12cd.zip | |
Accept using several persistent media with custom-ov label.
We didn't want this before with live-{rw,sn} and home-{rw,sn} style
persistence, so this was just a left-over. But we still can only allow
one each of root-ov, root-sn and home-sn.
Diffstat (limited to 'scripts/live-helpers')
| -rw-r--r-- | scripts/live-helpers | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scripts/live-helpers b/scripts/live-helpers index c1efeec..f1ebe86 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -401,8 +401,6 @@ find_persistent_media () do if [ "$(/sbin/blkid -s LABEL -o value $dev 2>/dev/null)" = "${label}" ] then - overlays=$(echo ${overlays} | sed -e "s|\<${label}\>||") - snapshots=$(echo ${snapshots} | sed -e "s|\<${label}\>||") echo "${label}=${dev}" # skip to the next device continue 2 @@ -424,7 +422,6 @@ find_persistent_media () path=${backing}/${PERSISTENT_PATH}${label} if [ -f "${path}" ] then - overlays=$(echo ${overlays} | sed -e "s|\<${label}\>||") overlay_on_dev="yes" echo "${label}=$(setup_loop "${path}" "loop" "/sys/block/loop*")" fi @@ -437,7 +434,6 @@ find_persistent_media () path="${PERSISTENT_PATH}${label}.${ext}" if [ -f "${backing}/${path}" ] then - snapshots=$(echo ${snapshots} | sed -e "s|\<${label}\>||") snapshot_on_dev="yes" echo "${label}=${dev}:${backing}:${path}" fi |