Merge remote-tracking branch 'live-boot-debian/debian' into debian

[live-boot-grml.git] / scripts / live

diff --git a/scripts/live b/scripts/live
index af8c12e..780c5de 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -1012,7 +1012,7 @@ setup_unionfs ()
                fi
 
                local root_snapdata=""
-               local home_snapshot_label=""
+               local home_snapdata=""
                local overlay_devices=""
                for media in $(find_persistence_media "${overlays}" "${snapshots}" "${whitelistdev}")
                do
@@ -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"