X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=bin%2Fbackup-script;h=5c8ea3f33c73b24e612eb26b626cafb0c5e4000b;hb=a3062a04258639c3d27dba00745e421fc8b377ce;hp=544960d9fedb2f4f207e17c4b496d16da0ce4ee0;hpb=b79f936d8ee57d661d14fb1dd7acab0b8eaed234;p=backup-script.git

diff --git a/bin/backup-script b/bin/backup-script
index 544960d..5c8ea3f 100755
--- a/bin/backup-script
+++ b/bin/backup-script
@@ -31,6 +31,7 @@ destinations=""
 	|| conf_d="/etc/backup-script.d"
 pre_exec=""
 post_exec=""
+default_backup_type="rsync"
 default_source_root="/"
 default_target="/var/backups"
 default_user="root"
@@ -156,7 +157,7 @@ CloneSubvolume() {
 		zfs snapshot "$snapshot" || return 1
 		link_name="$(echo "$snapshot" | cut -d@ -f2-)"
 		ln -s \
-			"$volume/.zfs/snapshot/$link_name" \
+			"current/.zfs/snapshot/$link_name" \
 			"$(dirname "$volume")/$link_name"
 		;;
 	  *)
@@ -299,7 +300,7 @@ while [ $# -gt 0 ]; do
 done
 
 echo -n "Started: "; date
-echo -e $config_info
+echo -e "$config_info"
 
 # Check rsync and its protocol version
 rsync=$(which "rsync" 2>/dev/null)
@@ -360,7 +361,7 @@ if [ -n "$pre_exec" ]; then
 fi
 
 for f in $sys; do
-	[ -r "$f" -a -f "$f" ] || continue
+	[[ -r "$f" && -f "$f" ]] || continue
 
 	fname=$(basename "$f")
 	case "$fname" in
@@ -371,6 +372,7 @@ for f in $sys; do
 
 	# Set global defaults
 	system="$fname"
+	backup_type="$default_backup_type"
 	user="$default_user"
 	source_root="$default_source_root"
 	target="$default_target"
@@ -390,7 +392,7 @@ for f in $sys; do
 	post_exec_saved="$post_exec"
 
 	# Compatibility with backup-pull(1) script: Set defaults
-	unset host
+	host=""
 	unset source
 	unset pre_exec
 	unset post_exec
@@ -399,13 +401,13 @@ for f in $sys; do
 	source "$f"
 
 	# Compatibility with backup-pull(1) script: Fix up configuration
-	[ "$system" = "$fname" -a -n "$host" ] \
+	[[ "$system" = "$fname" && -n "$host" ]] \
 		&& system="$host"
-	[ "$source_root" = "$default_source_root" -a -n "$source" ] \
+	[[ "$source_root" = "$default_source_root" && -n "$source" ]] \
 		&& source_root="$source"
-	[ -z "$job_pre_exec" -a -n "$pre_exec" ] \
+	[[ -z "$job_pre_exec" && -n "$pre_exec" ]] \
 		&& job_pre_exec="$pre_exec"
-	[ -z "$job_post_exec" -a -n "$post_exec" ] \
+	[[ -z "$job_post_exec" && -n "$post_exec" ]] \
 		&& job_post_exec="$post_exec"
 
 	# Compatibility with backup-pull(1) script: Restore global values ...
@@ -413,7 +415,7 @@ for f in $sys; do
 	post_exec="$post_exec_saved"
 
 	# Validate configuration
-	if [ "$system" = "localhost" -o "$system" = "127.0.0.1" ]; then
+	if [[ "$system" = "localhost" || "$system" = "127.0.0.1" ]]; then
 		# Local system
 		local=1
 		compress=0
@@ -455,7 +457,7 @@ for f in $sys; do
 
 	sys_target="$target/$fname"
 	sys_root="$sys_target"
-	if [ "$DRYRUN" -eq 0 -a ! -e "$sys_target" ]; then
+	if [[ "$DRYRUN" -eq 0 && ! -e "$sys_target" ]]; then
 		if [ $generations -gt 0 ]; then
 			CreateSubvolume "$sys_target"
 		else
@@ -467,7 +469,7 @@ for f in $sys; do
 		fi
 	fi
 
-	if [ "$local" -eq 0 -a "$ping" -ne 0 ]; then
+	if [[ "$local" -eq 0 && "$ping" -ne 0 ]]; then
 		# Check if system is alive
 		ping -c 1 "$system" >/dev/null 2>&1
 		if [ $? -ne 0 ]; then
@@ -488,7 +490,7 @@ for f in $sys; do
 
 		Initialize_Last_SysTarget_Snapshot "$sys_target" || continue
 
-		if [ -n "$last" -a ! -e "$last/.stamp" ]; then
+		if [[ -n "$last" && ! -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"
@@ -538,41 +540,46 @@ for f in $sys; do
 	fi
 
 	# prepare (remote) command ...
-	cmd="$rsync --archive"
-	[ "$compress" -ne 0 ] && cmd="$cmd --compress"
-	[ "$local" -eq 0 ] && cmd="$cmd --rsh=\"$ssh_cmd\""
-	cmd="$cmd --delete --delete-excluded --sparse"
-	if [ "$VERBOSE" -gt 0 ]; then
-		[ "$rsync_proto" -ge 31 ] \
-			&& cmd="$cmd --info=progress2" \
-			|| cmd="$cmd --progress"
-	fi
-	if [ "$source_root" = "$default_source_root" ]; then
-		for dir in \
-			"/dev/**" \
-			"/media/**" \
-			"/mnt/**" \
-			"/net/**" \
-			"/proc/**" \
-			"/run/**" \
-			"/sys/**" \
-			"/tmp/**" \
-			"/var/cache/apt/**" \
-			"/var/log/**" \
-			"/var/tmp/**" \
-		; do
+	if [[ "$backup_type" == "rsync" ]]; then
+		cmd="$rsync --archive"
+		[ "$compress" -ne 0 ] && cmd="$cmd --compress"
+		[ "$local" -eq 0 ] && cmd="$cmd --rsh=\"$ssh_cmd\""
+		cmd="$cmd --delete --delete-excluded --sparse"
+		if [ "$VERBOSE" -gt 0 ]; then
+			[ "$rsync_proto" -ge 31 ] \
+				&& cmd="$cmd --info=progress2" \
+				|| cmd="$cmd --progress"
+		fi
+		if [ "$source_root" = "$default_source_root" ]; then
+			for dir in \
+				"/dev/**" \
+				"/media/**" \
+				"/mnt/**" \
+				"/net/**" \
+				"/proc/**" \
+				"/run/**" \
+				"/sys/**" \
+				"/tmp/**" \
+				"/var/cache/apt/**" \
+				"/var/log/**" \
+				"/var/tmp/**" \
+			; do
+				cmd="$cmd --exclude=$dir"
+			done
+		fi
+		[ -n "$exclude_args_add" ] && cmd="$cmd $exclude_args_add"
+		for dir in $exclude_dirs_add; do
 			cmd="$cmd --exclude=$dir"
 		done
-	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"
+		[ -n "$rsync_args_add" ] && cmd="$cmd $rsync_args_add"
 
-	[ "$local" -eq 0 ] \
-		&& cmd="$cmd ${user}@${system}:$source_root $sys_target/" \
-		|| cmd="$cmd $source_root $sys_target/"
+		[ "$local" -eq 0 ] \
+			&& cmd="$cmd ${user}@${system}:$source_root $sys_target/" \
+			|| cmd="$cmd $source_root $sys_target/"
+	else
+		echo "Backup type \"$backup_type\" undefined, \"$system\" skipped!"
+		echo; continue
+	fi
 
 	echo "Backing up to \"$sys_target\" ..."
 	echo -n "Start date: "; date
@@ -595,7 +602,7 @@ for f in $sys; do
 	fi
 
 	echo -n "End date: "; date
-	if [ $ret -eq 0 -o $ret -eq 24 ]; then
+	if [[ $ret -eq 0 || $ret -eq 24 ]]; then
 		[ $ret -eq 24 ] && count_ok_vanished=$count_ok_vanished+1
 
 		echo "System \"$system\" completed with status $ret, OK."
@@ -619,7 +626,7 @@ for f in $sys; do
 		# Clean up old generations
 		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
+		if [[ -n "$to_delete" && $ok -eq 1 ]]; then
 			[ "$DRYRUN" -eq 0 ] \
 				&& echo "Deleting old backup generations (keep $generations) ..." \
 				|| echo " *** Trial run, not deleting old generations:"