rzerres/dsnap-sync
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

snap-sync: parse_params update, reduce log-entry verbosity

Browse Source
This commit is contained in:
Ralf Zerres
2017-11-21 15:25:52 +01:00
parent 9002e502c4
commit eac70fc001
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
bin/snap-sync
View File

@@ -356,13 +356,15 @@ parse_params () {
fi fi
if [ "$verbose" ]; then if [ "$verbose" ]; then
printf "Snap UUID: '%s'\n" "$uuid_cmdline" printf "$progname (runtime arguments)\n"
printf "Snap TARGET: '%s'\n" "$target_cmdline" printf "for backup-source:\n"
printf "Snap SUBVOLID: '%s'\n" "$subvolid_cmdline" printf " selected configs: '%s'\n" "$selected_configs"
printf "Snap Backupdir: '%s'\n" "$backupdir_cmdline" printf "for backup-target:\n"
printf "Snap Description: '%s'\n" "$description" printf " disk UUID: '%s'\n" "$uuid_cmdline"
printf "Snap Config: '%s'\n" "$selected_config" printf " disk TARGET: '%s'\n" "$target_cmdline"
printf "Snap Remote: '%s'\n" "$ssh" printf " disk SUBVOLID: '%s'\n" "$subvolid_cmdline"
printf " disk Backupdir: '%s'\n" "$backupdir_cmdline"
printf " remote host: '%s'\n" "$ssh"
printf "Snapper Descriptions" printf "Snapper Descriptions"
printf " backup finished: '%s'\n" "$snap_description_finished" printf " backup finished: '%s'\n" "$snap_description_finished"
@@ -527,7 +529,8 @@ run_config () {
run_backup () { run_backup () {
# Actual backing up # Actual backing up
printf "\nPerforming backups...\n" | tee $PIPE #printf "\nPerforming backups...\n" | tee $PIPE
printf "\nPerforming backups...\n"
i=-1 i=-1
for selected_config in $selected_configs; do for selected_config in $selected_configs; do
@@ -865,11 +868,11 @@ select_target_disk () {
selected_uuid=$(eval echo \$disk_uuid_$disk_selected) selected_uuid=$(eval echo \$disk_uuid_$disk_selected)
selected_target=$(eval echo \$disk_target_$disk_selected) selected_target=$(eval echo \$disk_target_$disk_selected)
selected_subvol=$(eval echo \$fs_options_$disk_selected | sed -e 's/.*subvolid=\([0-9]*\).*/\1/') selected_subvol=$(eval echo \$fs_options_$disk_selected | sed -e 's/.*subvolid=\([0-9]*\).*/\1/')
if [ "$verbose" ]; then if [ "$dryrun" ]; then
printf "Selected Subvol-ID=%s: %s on %s\n" "$selected_subvol" "$selected_target" "$selected_uuid" printf "Selected Subvol-ID=%s: %s on %s\n" "$selected_subvol" "$selected_target" "$selected_uuid"
fi fi
} }
traperror () { traperror () {
printf "Exited due to error on line %s.\n" $1 printf "Exited due to error on line %s.\n" $1
printf "exit status: %s\n" "$2" printf "exit status: %s\n" "$2"
@@ -1033,7 +1036,7 @@ fi
# select the target BTRFS subvol # select the target BTRFS subvol
select_target_disk select_target_disk
printf "\nYou selected the disk with UUID %s.\n" "$selected_uuid" | tee $PIPE printf "\nYou selected the disk with UUID %s (subvolid=%s).\n" "$selected_uuid" "$selected_subvol" | tee $PIPE
if [ -z "$ssh" ]; then if [ -z "$ssh" ]; then
printf "The disk is mounted at %s.\n" "$selected_target" | tee $PIPE printf "The disk is mounted at %s.\n" "$selected_target" | tee $PIPE
else else