summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-04-09 16:11:16 +0200
committerTails developers <amnesia@boum.org>2012-04-09 16:52:42 +0200
commitc857e16ba065ab92476bad582dc28f1150e21502 (patch)
tree9fb5096b684dbe31ffa6f3d6443b784976b81963
parentadbd339371f5525d1271d089cb495edc0ded854f (diff)
downloadlive-boot-c857e16ba065ab92476bad582dc28f1150e21502.tar.gz
live-boot-c857e16ba065ab92476bad582dc28f1150e21502.zip
Only try copying snapshots if we actually found any.
-rwxr-xr-xscripts/live4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/live b/scripts/live
index 772ccc5..780c5de 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1215,9 +1215,9 @@ setup_unionfs ()
done
# Look for other snapshots to copy in
- try_snap "${root_snapdata}" "${rootmnt}" "ROOT"
+ [ -n "${root_snapdata}" ] && try_snap "${root_snapdata}" "${rootmnt}" "ROOT"
# This second type should be removed when snapshot grow smarter
- try_snap "${home_snapdata}" "${rootmnt}" "HOME" "/home"
+ [ -n "${home_snapdata}" ] && try_snap "${home_snapdata}" "${rootmnt}" "HOME" "/home"
fi
mkdir -p "${rootmnt}/live"