Only try copying snapshots if we actually found any.
authorTails developers <amnesia@boum.org>
Mon, 9 Apr 2012 14:11:16 +0000 (16:11 +0200)
committerTails developers <amnesia@boum.org>
Mon, 9 Apr 2012 14:52:42 +0000 (16:52 +0200)
scripts/live

index 772ccc5..780c5de 100755 (executable)
@@ -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"