Merge branch 'directsquash'

1 files changed, 11 insertions, 6 deletions

diff --git a/squashfu b/squashfu
index 6899c24..d5b6036 100755
--- a/squashfu
+++ b/squashfu
@@ -24,10 +24,17 @@ create_new_squash () {
 # Args: number of bins to be squashed (as determined by check_for_resquash), -1 on initial creation
 # Returns: 0 on success, non-zero on failure
 
-    # If making first seed, create it empty and return
+    # If making first seed, create it directly from source
     if [[ $1 -eq -1 ]]; then
-        mksquashfs "$UNION_MOUNT" "$SEED" -b 65536 >/dev/null
-        return $?
+        info "Creating seed from sources (this may take a while)"
+        mksquashfs "${INCLUDES[@]}" "$SEED" -b 65536 -e "${EXCLUDES[@]}" >/dev/null
+        if [[ $? -eq 0 ]]; then
+            mount_squash
+            info "Seed creation finished. It has been mounted at "$SQUASH_MOUNT" if you would like to make sure the proper files are included"
+            return 0;
+        else
+            die "There was an error creating the initial squash."
+        fi
     fi
 
     # Determine oldest $1 bins and mount them with the current squash
@@ -243,7 +250,7 @@ action_backup () {
         mkdir -p "${BINS_DIR}"
         touch "$BINVENTORY"
         create_new_squash -1
-        FIRST_RUN=1
+        exit 0
     fi
 
     info "Backup requested at $(date --rfc-3339=seconds)"
@@ -257,8 +264,6 @@ action_backup () {
     check_for_resquash
     if [[ val=$? -gt 0 ]]; then
         create_new_squash $val
-    elif [[ $FIRST_RUN -eq 1 ]]; then
-        create_new_squash 1
     fi
 
     # TODO: Report if requested