X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=bin%2Fbackup-script;h=95b376cf271d558e717abd4243e9f1b9919648eb;hb=3ed5497b057076f284ba71f975f8e0a5a16085c1;hp=79b171d508a76a6b347cabf09f0c6121c6520644;hpb=ba417b7981ecc500007d71f33ebe04d40b7b1497;p=backup-script.git

diff --git a/bin/backup-script b/bin/backup-script
index 79b171d..95b376c 100755
--- a/bin/backup-script
+++ b/bin/backup-script
@@ -72,6 +72,7 @@ GotSignal() {
 	CleanUp
 	echo -n "Aborted: "; date
 	echo
+	sleep 3
 	exit 9
 }
 
@@ -122,6 +123,9 @@ CreateSubvolume() {
 	  "btrfs")
 		btrfs subvolume create "$volume"  >/dev/null || return 1
 		;;
+	  "zfs")
+		zfs create "$(echo "$volume" | cut -c2-)" || return 1
+		;;
 	  *)
 		echo "CreateSubvolume: Incompatible FS type \"$fs\" on \"$dir\"!"
 		return 9
@@ -132,14 +136,23 @@ CreateSubvolume() {
 CloneSubvolume() {
 	local source="$1"
 	local volume="$2"
+	local snapshot="$3"
 	local dir
 	local fs
+	local link_name
 
 	dir=$(dirname "source")
 	fs=$(GetFS "$source")
 	case "$fs" in
 	  "btrfs")
-		btrfs subvolume snapshot "$source" "$volume"  >/dev/null || return 1
+		btrfs subvolume snapshot "$source" "$snapshot"  >/dev/null || return 1
+		;;
+	  "zfs")
+		zfs snapshot "$snapshot" || return 1
+		link_name="$(echo "$snapshot" | cut -d@ -f2-)"
+		ln -s \
+			"$volume/.zfs/snapshot/$link_name" \
+			"$(dirname "$volume")/$link_name"
 		;;
 	  *)
 		echo "CloneSubvolume: Incompatible FS type \"$fs\" on \"$source\"!"
@@ -158,6 +171,12 @@ RenameSubvolume() {
 	  "btrfs")
 		mv "$source" "$target" || return 1
 		;;
+	  "zfs")
+		zfs rename \
+		  "$(echo "$source" | cut -c2-)" \
+		  "$(echo "$target" | cut -c2-)" \
+			|| return 1
+		;;
 	  *)
 		echo "RenameSubvolume: Incompatible FS type \"$fs\" on \"$source\"!"
 		return 9
@@ -168,12 +187,24 @@ RenameSubvolume() {
 DeleteSubvolume() {
 	local volume="$1"
 	local fs
+	local id
+	local snapshot
 
-	fs=$(GetFS "$source")
+	fs=$(GetFS "$volume")
 	case "$fs" in
 	  "btrfs")
 		btrfs subvolume delete "$volume" >/dev/null || return 1
 		;;
+	  "zfs")
+		id="$(basename "$volume")"
+		if [ -h "$volume" ]; then
+			snapshot="$(dirname "$volume")/current@$id"
+		else
+			snapshot="$volume"
+		fi
+		zfs destroy -r "$(echo "$snapshot" | cut -c2-)" >/dev/null || return 1
+		[ -h "$volume" ] && rm "$volume"
+		;;
 	  *)
 		echo "DeleteSubvolume: Incompatible FS type \"$fs\" on \"$volume\"!"
 		return 9
@@ -181,6 +212,61 @@ DeleteSubvolume() {
 	return 0
 }
 
+Initialize_Last_SysTarget_Snapshot() {
+	sys_target="$1"
+	unset last
+	unset snapshot
+
+	fs=$(GetFS "$sys_target")
+	case "$fs" in
+	  "btrfs")
+		# Search directory of last generation, if any
+		last=$(ls -1d "$sys_target"/[0-9]* 2>/dev/null | sort -r | head -n1)
+		if [ -n "$last" ]; then
+			if [ ! -d "$last" ]; then
+				echo "Last snapshot \"$last\" seems not to be a directory!? \"$system\" skipped!"
+				echo
+				return 1
+			fi
+		fi
+		sys_target="$sys_target/$(date +%Y%m%d-%H%M%S)"
+		snapshot="$sys_target"
+		;;
+	  "zfs")
+		# On ZFS, the last generation is always named "current"
+		if [ -e "$sys_target/current" ]; then
+			last="$sys_target/current"
+			if [ "$(uname)" = "Linux" ]; then
+				date=$(LC_ALL=C stat "$1" | grep "^Modify: " \
+				 | cut -d':' -f2- | cut -d. -f1)
+			else
+				date=$(LC_ALL=C stat -f "%Sc" "$1")
+			fi
+			date=$(echo "$date" | sed -e's/^ //g' -e 's/[-:]//g' -e 's/ /-/g')
+
+		else
+			last=""
+			date="$(date +%Y%m%d-%H%M%S)"
+		fi
+		snapshot="$(echo "$sys_target/current" | cut -c2-)@$date"
+		sys_target="$sys_target/current"
+		;;
+	  *)
+		echo "Initialize_Last_SysTarget_Snapshot: Incompatible FS type \"$fs\" on \"$sys_target\"!"
+		return 1
+	esac
+	return 0
+}
+
+# Search configuration file (last one is used as default!)
+for conf in \
+	"/usr/local/etc/backup-script.conf" \
+	"${conf_d}/backup-script.conf" \
+	"/etc/backup-script.conf" \
+; do
+	[ -r "$conf" ] && break
+done
+
 while [ $# -gt 0 ]; do
 	case "$1" in
 	  "-n"|"--dry-run")
@@ -201,12 +287,13 @@ trap GotSignal SIGINT
 
 echo -n "Started: "; date
 
-for conf in "/etc/backup-script.conf" "${conf_d}/backup-script.conf"; do
-	if [ -r "$conf" ]; then
-		echo "Reading configuration: \"$conf\" ..."
-		source "$conf"
-	fi
-done
+# Read in configuration file
+if [ -r "$conf" ]; then
+	echo "Reading configuration: \"$conf\" ..."
+	source "$conf"
+else
+	echo "No configuration file found, using defaults."
+fi
 echo
 
 if [ $# -ge 1 ]; then
@@ -276,12 +363,51 @@ 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
 
+	# Make sure "source" ends with a slash ("/")
+	case "$source" in
+	  "*/")
+		;;
+	  "*")
+		source="$source/"
+	esac
+
+	# Make sure "target" DOESN'T end with a slash ("/")
+	case "$target" in
+	  "*/")
+		target=$( echo "$target" | sed -e 's/\/$//g' )
+		;;
+	esac
+
 	[ "$system" = "$fname" ] \
 		&& systxt="\"$system\"" \
 		|| systxt="\"$fname\" [\"$system\"]"
@@ -303,8 +429,12 @@ for f in $sys; do
 
 	sys_target="$target/$fname"
 	sys_root="$sys_target"
-	if [ "$DRYRUN" -eq 0 ]; then
-		mkdir -p "$sys_target" >/dev/null 2>&1
+	if [ "$DRYRUN" -eq 0 -a ! -e "$sys_target" ]; then
+		if [ $generations -gt 0 ]; then
+			CreateSubvolume "$sys_target"
+		else
+			mkdir -p "$sys_target"
+		fi
 		if [ $? -ne 0 ]; then
 			echo "Can't create \"$sys_target\"!? \"$system\" skipped!"
 			echo; continue
@@ -330,15 +460,7 @@ for f in $sys; do
 			echo; continue
 		fi
 
-		# Search directory of last generation, if any
-		last=$(ls -1d "$sys_target"/[0-9]* 2>/dev/null | sort -r | head -n1)
-		if [ -n "$last" ]; then
-			if [ ! -d "$last" ]; then
-				echo "Last snapshot \"$last\" seems not to be a directory!? \"$system\" skipped!"
-				echo; continue
-			fi
-		fi
-		sys_target="$sys_target/$(date +%Y%m%d-%H%M%S)"
+		Initialize_Last_SysTarget_Snapshot "$sys_target" || continue
 
 		if [ -n "$last" -a ! -e "$last/.stamp" ]; then
 			# Old backup directory without "stamp file", continue
@@ -352,14 +474,14 @@ 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"; 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\"!"
+				echo " *** Trial run, not creating new snapshot in \"$snapshot\"!"
 			fi
 		else
 			# No old backup found, create new subvolume
@@ -452,8 +574,8 @@ 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 (keep $generations) ..." \