X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=bin%2Fbackup-script;h=fb9fee4b500f7bc0b9f1db24979d1c0197022805;hb=abf81bab512e361ddb171d36a81332c1b1fd5315;hp=d28a4d8fc3b570ddf37a8c536c2c73326ec7da8d;hpb=e2e8ca09cc4c185b159e126bfaf9864dc2b48def;p=backup-script.git diff --git a/bin/backup-script b/bin/backup-script index d28a4d8..fb9fee4 100755 --- a/bin/backup-script +++ b/bin/backup-script @@ -37,6 +37,7 @@ default_user="root" default_ssh_args_add="" default_rsync_args_add="" default_exclude_args_add="" +default_exclude_dirs_add="" default_compress=1 default_ping=1 default_local=0 @@ -363,6 +364,7 @@ for f in $sys; do ssh_args_add="$default_ssh_args_add" rsync_args_add="$default_rsync_args_add" exclude_args_add="$default_exclude_args_add" + exclude_dirs_add="$default_exclude_dirs_add" compress="$default_compress" ping="$default_ping" local="$default_local" @@ -535,6 +537,9 @@ for f in $sys; do cmd="$cmd --exclude=/var/cache/apt --exclude=/var/log" fi [ -n "$exclude_args_add" ] && cmd="$cmd $exclude_args_add" + for dir in $exclude_dirs_add; do + cmd="$cmd --exclude=$dir" + done [ -n "$rsync_args_add" ] && cmd="$cmd $rsync_args_add" [ "$local" -eq 0 ] \ @@ -619,10 +624,27 @@ done sync -paths=$( echo $destinations | sed -e 's/ /\n/g' | sort | uniq ) -if [ "$DRYRUN" -eq 0 -a -n "$paths" ]; then - df -h $paths - echo +if [ "$DRYRUN" -eq 0 ]; then + paths="" + paths_zfs="" + for dest in $(echo $destinations | sed -e 's/ /\n/g' | sort | uniq); do + fs=$(GetFS "$dest") + case $fs in + "zfs" ) + paths_zfs="$paths_zfs $dest" + ;; + *) + paths="$paths $dest" + esac + done + if [ -n "$paths" ]; then + df -h $paths + echo + fi + if [ -n "$paths_zfs" ]; then + zfs list $paths_zfs + echo + fi fi CleanUp