]> arthur.barton.de Git - backup-script.git/blobdiff - bin/backup-script
Add compatibility layer for backup-pull(1) config files
[backup-script.git] / bin / backup-script
index 67758111987339ec83380e1837e154abdb3f4f2d..b3a3bd8d6776d92c22b70486a32694eb56534e18 100755 (executable)
@@ -29,6 +29,7 @@ destinations=""
 conf_d="/etc/backup-script.d"
 pre_exec=""
 post_exec=""
+default_source_root="/"
 default_target=""
 default_user="root"
 default_ssh_args_add=""
@@ -75,8 +76,8 @@ GotSignal() {
 }
 
 ExecJob() {
-       what="$1"
-       cmd="$2"
+       local what="$1"
+       local cmd="$2"
 
        echo "Running job ${what}-exec command ..."
        [ "$local" -eq 0 ] \
@@ -84,7 +85,7 @@ ExecJob() {
        echo -n "Start date (${what}-exec): "; date
        echo "$cmd"
        if [ "$DRYRUN" -eq 0 ]; then
-               $SHELL -c "$cmd"; ret=$?
+               $SHELL -c "$cmd"; local ret=$?
        else
                echo " *** Trial run, not executing ${what}-exec command!"
                ret=0
@@ -95,30 +96,90 @@ ExecJob() {
        return $ret
 }
 
-CreateSubvolume() {
-       volume="$2"
+GetFS() {
+       local dir="$1"
 
-       btrfs subvolume create "$volume"
+       while [ -n "$dir" ]; do
+               findmnt -fn -o FSTYPE --raw "$dir" 2>/dev/null; local r=$?
+               if [ $r -eq 0 ]; then
+                       return 0
+               elif [ $r -eq 127 ]; then
+                       echo "UNKNOWN"
+                       return 1
+               fi
+               dir=$(dirname "$dir") || return 1
+       done
 }
 
-CloneSubvolume() {
-       source="$1"
-       volume="$2"
+CreateSubvolume() {
+       local volume="$1"
+       local fs
+       local dir
+
+       dir=$(dirname "$volume")
+       fs=$(GetFS "$dir")
+       case "$fs" in
+         "btrfs")
+               btrfs subvolume create "$volume"  >/dev/null || return 1
+               ;;
+         *)
+               echo "CreateSubvolume: Incompatible FS type \"$fs\" on \"$dir\"!"
+               return 9
+       esac
+       return 0
+}
 
-       btrfs subvolume snapshot "$source" "$volume"
+CloneSubvolume() {
+       local source="$1"
+       local volume="$2"
+       local snapshot="$3"
+       local dir
+       local fs
+
+       dir=$(dirname "source")
+       fs=$(GetFS "$source")
+       case "$fs" in
+         "btrfs")
+               btrfs subvolume snapshot "$source" "$snapshot"  >/dev/null || return 1
+               ;;
+         *)
+               echo "CloneSubvolume: Incompatible FS type \"$fs\" on \"$source\"!"
+               return 9
+       esac
+       return 0
 }
 
 RenameSubvolume() {
-       source="$1"
-       target="$2"
-
-       mv "$source" "$target"
+       local source="$1"
+       local target="$2"
+       local fs
+
+       fs=$(GetFS "$source")
+       case "$fs" in
+         "btrfs")
+               mv "$source" "$target" || return 1
+               ;;
+         *)
+               echo "RenameSubvolume: Incompatible FS type \"$fs\" on \"$source\"!"
+               return 9
+       esac
+       return 0
 }
 
 DeleteSubvolume() {
-       volume="$1"
+       local volume="$1"
+       local fs
 
-       btrfs subvolume delete "$volume"
+       fs=$(GetFS "$source")
+       case "$fs" in
+         "btrfs")
+               btrfs subvolume delete "$volume" >/dev/null || return 1
+               ;;
+         *)
+               echo "DeleteSubvolume: Incompatible FS type \"$fs\" on \"$volume\"!"
+               return 9
+       esac
+       return 0
 }
 
 while [ $# -gt 0 ]; do
@@ -204,6 +265,7 @@ for f in $sys; do
        # Set global defaults
        system="$fname"
        user="$default_user"
+       source_root="$default_source_root"
        target="$default_target"
        ssh_args_add="$default_ssh_args_add"
        rsync_args_add="$default_rsync_args_add"
@@ -215,9 +277,33 @@ for f in $sys; do
        job_pre_exec="$default_job_pre_exec"
        job_post_exec="$default_job_post_exec"
 
+       # Compatibility with backup-pull(1) script: Save global values ...
+       pre_exec_saved="$pre_exec"
+       post_exec_saved="$post_exec"
+
+       # Compatibility with backup-pull(1) script: Set defaults
+       unset host
+       unset source
+       unset pre_exec
+       unset post_exec
+
        # Read in system configuration file
        source "$f"
 
+       # Compatibility with backup-pull(1) script: Fix up configuration
+       [ "$system" = "$fname" -a -n "$host" ] \
+               && system="$host"
+       [ "$source_root" = "$default_source_root" -a -n "$source" ] \
+               && source_root="$source"
+       [ -z "$job_pre_exec" -a -n "$pre_exec" ] \
+               && job_pre_exec="$pre_exec"
+       [ -z "$job_post_exec" -a -n "$post_exec" ] \
+               && job_post_exec="$post_exec"
+
+       # Compatibility with backup-pull(1) script: Restore global values ...
+       pre_exec="$pre_exec_saved"
+       post_exec="$post_exec_saved"
+
        # Validate configuration
        [ "$system" = "localhost" -o "$system" = "127.0.0.1" ] && local=1
 
@@ -278,11 +364,12 @@ for f in $sys; do
                        fi
                fi
                sys_target="$sys_target/$(date +%Y%m%d-%H%M%S)"
+               snapshot="$sys_target"
 
                if [ -n "$last" -a ! -e "$last/.stamp" ]; then
                        # Old backup directory without "stamp file", continue
                        echo "Found incomplete snapshot in \"$last\", reusing and renaming it ..."
-                       RenameSubvolume "$last" "$sys_target" >/dev/null 2>&1
+                       RenameSubvolume "$last" "$sys_target"
                        if [ $? -ne 0 ]; then
                                echo "Failed to rename last snapshot \"$last\" to \"$sys_target\"!? \"$system\" skipped!"
                                echo; continue
@@ -291,21 +378,19 @@ for f in $sys; do
                        # Old backup directory found, create new snapshot
                        echo "Found last snapshot in \"$last\"."
                        if [ "$DRYRUN" -eq 0 ]; then
-                               CloneSubvolume \
-                                 "$last" "$sys_target" >/dev/null 2>&1; r=$?
+                               CloneSubvolume "$last" "$sys_target" "$snapshot"; r=$?
                                if [ $r -ne 0 ]; then
-                                       echo "Can't create snapshot \"$sys_target\" of \"$last\", code $r!? \"$system\" skipped!"
+                                       echo "Can't create snapshot \"$snapshot\" of \"$last\", code $r!? \"$system\" skipped!"
                                        echo; continue
                                fi
-                               echo "Created new snapshot in \"$sys_target\"."
+                               echo "Created new snapshot in \"$snapshot\"."
                        else
                                echo " *** Trial run, not creating new snapshot in \"$sys_target\"!"
                        fi
                else
                        # No old backup found, create new subvolume
                        if [ "$DRYRUN" -eq 0 ]; then
-                               CreateSubvolume \
-                                 "$sys_target" >/dev/null 2>&1; r=$?
+                               CreateSubvolume "$sys_target"; r=$?
                                if [ $r -ne 0 ]; then
                                        echo "Can't create subvolume \"$sys_target\", code $r!? \"$system\" skipped!"
                                        echo; continue
@@ -333,25 +418,28 @@ for f in $sys; do
        # prepare (remote) command ...
        cmd="rsync --archive"
        [ "$compress" -ne 0 ] && cmd="$cmd --compress"
-       cmd="$cmd --rsh=\"$ssh_cmd\" --delete --delete-excluded --sparse"
+       [ "$local" -eq 0 ] && cmd="$cmd --rsh=\"$ssh_cmd\""
+       cmd="$cmd --delete --delete-excluded --sparse"
        [ "$VERBOSE" -gt 0 ] && cmd="$cmd --progress"
-       cmd="$cmd --exclude=/dev --exclude=/proc --exclude=/sys"
-       cmd="$cmd --exclude=/run --exclude=/tmp --exclude=/var/tmp"
-       cmd="$cmd --exclude=/media --exclude=/mnt --exclude=/net"
-       cmd="$cmd --exclude=/var/cache/apt --exclude=/var/log"
+       if [ "$source_root" = "$default_source_root" ]; then
+               cmd="$cmd --exclude=/dev --exclude=/proc --exclude=/sys"
+               cmd="$cmd --exclude=/run --exclude=/tmp --exclude=/var/tmp"
+               cmd="$cmd --exclude=/media --exclude=/mnt --exclude=/net"
+               cmd="$cmd --exclude=/var/cache/apt --exclude=/var/log"
+       fi
        [ -n "$exclude_args_add" ] && cmd="$cmd $exclude_args_add"
        [ -n "$rsync_args_add" ] && cmd="$cmd $rsync_args_add"
 
        [ "$local" -eq 0 ] \
-               && cmd="$cmd ${user}@${system}:/ $sys_target/" \
-               || cmd="$cmd / $sys_target/"
+               && cmd="$cmd ${user}@${system}:$source_root $sys_target/" \
+               || cmd="$cmd $source_root $sys_target/"
 
        echo "Backing up to \"$sys_target\" ..."
        echo -n "Start date: "; date
        echo "$cmd"
        count_started=$count_started+1
        ok=0
-       
+
        if [ "$DRYRUN" -eq 0 ]; then
                rm -f "$sys_target/.stamp"
                $SHELL -c "$cmd"; ret=$?
@@ -390,10 +478,11 @@ for f in $sys; do
                        ln -s "$sys_target" "$sys_root/latest"
                fi
                # Clean up old generations
-               to_delete=$(ls -1t "$sys_root" 2>/dev/null | tail -n+$generations | sort)
+               declare -i gen_count=$generations+2
+               to_delete=$(ls -1t "$sys_root" 2>/dev/null | tail -n+$gen_count | sort)
                if [ -n "$to_delete" -a $ok -eq 1 ]; then
                        [ "$DRYRUN" -eq 0 ] \
-                               && echo "Deleting old backup generations:" \
+                               && echo "Deleting old backup generations (keep $generations) ..." \
                                || echo " *** Trial run, not deleting old generations:"
                        for delete in $to_delete; do
                                dir="$sys_root/$delete"
@@ -405,10 +494,9 @@ for f in $sys; do
                                 | cut -d':' -f2- | cut -d. -f1)
                                echo "Removing backup from" $last "..."
                                if [ "$DRYRUN" -eq 0 ]; then
-                                       DeleteSubvolume \
-                                        "$dir" >/dev/null 2>&1
+                                       DeleteSubvolume "$dir"
                                        [ $? -eq 0 ] || \
-                                        echo "Failed to delete \"$dir\"!"
+                                         echo "Failed to delete \"$dir\"!"
                                fi
                        done
                        echo -n "Clean up finished: "; date