merged patch from pavoldomin (issue #192) concerning better BACKUP/OU…

…TPUT_URL split-up

=> must say would have been easier if it was a pull request.
=> in my tests it seems to work, but need plenty more user-tests and feedback
==> keep this issue open for follow-up matters
@pavoldomin thanks for the patch - can you test it as well?
Gratien

usr/share/rear/backup/NETFS/default/15_save_copy_of_prefix_dir.sh

@@ -6,7 +6,7 @@
 url="$( echo $stage | tr '[:lower:]' '[:upper:]')_URL"
 local scheme=$(url_scheme ${!url})
 local path=$(url_path ${!url})
-local opath=$(output_path $scheme $path)
+local opath=$(backup_path $scheme $path)
 
 # if $opath is empty return silently (e.g. scheme tape)
 [ -z "$opath" ] && return 0

usr/share/rear/backup/NETFS/default/20_make_prefix_dir.sh

@@ -5,7 +5,7 @@
 url="$( echo $stage | tr '[:lower:]' '[:upper:]')_URL"
 local scheme=$(url_scheme ${!url})
 local path=$(url_path ${!url})
-local opath=$(output_path $scheme $path)
+local opath=$(backup_path $scheme $path)
 
 # if $opath is empty return silently (e.g. scheme tape)
 [ -z "$opath" ] && return 0

usr/share/rear/backup/NETFS/default/25_create_lock.sh

@@ -5,7 +5,7 @@
 url="$( echo $stage | tr '[:lower:]' '[:upper:]')_URL"
 local scheme=$(url_scheme ${!url})
 local path=$(url_path ${!url})
-local opath=$(output_path $scheme $path)
+local opath=$(backup_path $scheme $path)
 
 # if $opath is empty return silently (e.g. scheme tape)
 [ -z "$opath" ] && return 0

usr/share/rear/backup/NETFS/default/50_make_backup.sh

@@ -31,7 +31,7 @@ done < $TMP_DIR/backup-exclude.txt
 
 local scheme=$(url_scheme $BACKUP_URL)
 local path=$(url_path $BACKUP_URL)
-local opath=$(output_path $scheme $path)
+local opath=$(backup_path $scheme $path)
 
 if [[ "$opath" ]]; then
     mkdir -p $v "${opath}" >&2

usr/share/rear/backup/NETFS/default/97_remove_lock.sh

@@ -1,7 +1,8 @@
 # remove the lockfile
-local scheme=$(url_scheme $OUTPUT_URL)
-local path=$(url_path $OUTPUT_URL)
-local opath=$(output_path $scheme $path)
+url="$( echo $stage | tr '[:lower:]' '[:upper:]')_URL"
+local scheme=$(url_scheme ${!url})
+local path=$(url_path ${!url})
+local opath=$(backup_path $scheme $path)
 
 # if $opath is empty return silently (e.g. scheme tape)
 [ -z "$opath" ] && return 0

usr/share/rear/conf/default.conf

@@ -119,6 +119,10 @@ OUTPUT_URL=
 OUTPUT_OPTIONS=
 OUTPUT_MOUNTCMD=
 OUTPUT_UMOUNTCMD=
+OUTPUT_PREFIX="$HOSTNAME"
+# keep an older copy of the output (mv $OUTPUT_PREFIX $OUTPUT_PREFIX.old before we copy the new version)
+# empty means only keep current output
+KEEP_OLD_OUTPUT_COPY=
 
 ##
 # OUTPUT=RAMDISK stuff

usr/share/rear/lib/global-functions.sh

@@ -48,7 +48,7 @@ url_path() {
     echo /${path#*/}
 }
 
-output_path() {
+backup_path() {
     local scheme=$1
     local path=$2
     case $scheme in
@@ -65,6 +65,24 @@ output_path() {
     echo "$path"
 }
 
+output_path() {
+    local scheme=$1
+    local path=$2
+    case $scheme in
+       (tape)  # no path for tape required
+           path=""
+           ;;
+       (file)  # type file needs a local path (must be mounted by user)
+           path="$path/${OUTPUT_PREFIX}"
+           ;;
+       (*)     # nfs, cifs, usb, a.o. need a temporary mount-path 
+           path="${BUILD_DIR}/outputfs/${OUTPUT_PREFIX}"
+           ;;
+    esac
+    echo "$path"
+}
+
+
 ### Mount URL $1 at mountpoint $2[, with options $3]
 mount_url() {
     local url=$1

usr/share/rear/output/default/15_save_copy_of_prefix_dir.sh

@@ -0,0 +1,25 @@
+# if KEEP_OLD_OUTPUT_COPY is not empty then move old OUTPUT_PREFIX directory to OUTPUT_PREFIX.old
+
+[ -z "${KEEP_OLD_OUTPUT_COPY}" ] && return
+
+# do not do this for tapes and special attention for file:///path
+url="$( echo $stage | tr '[:lower:]' '[:upper:]')_URL"
+local scheme=$(url_scheme ${!url})
+local path=$(url_path ${!url})
+local opath=$(output_path $scheme $path)
+
+# if $opath is empty return silently (e.g. scheme tape)
+[ -z "$opath" ] && return 0
+
+if ! test -f "${opath}/.lockfile" ; then
+        # lockfile made through workflow backup already (so output keep hands off)
+        if test -d "${opath}" ; then
+                rm -rf $v "${opath}.old" >&2
+                StopIfError "Could not remove '${opath}.old'"
+                mv -f $v "${opath}" "${opath}.old" >&2
+                StopIfError "Could not move '${opath}'"
+        fi
+else
+        Log "Lockfile '${opath}/.lockfile' found. Not keeping old backup data."
+fi
+# the ${BUILD_DIR}/outputfs/${OUTPUT_PREFIX} will be created by output/default/20_make_prefix_dir.sh

usr/share/rear/output/default/20_make_prefix_dir.sh

@@ -0,0 +1,14 @@
+# if set, create $OUTPUT_PREFIX under the mounted network filesystem share. This defaults
+# to $HOSTNAME
+
+# do not do this for tapes and special attention for file:///path
+url="$( echo $stage | tr '[:lower:]' '[:upper:]')_URL"
+local scheme=$(url_scheme ${!url})
+local path=$(url_path ${!url})
+local opath=$(output_path $scheme $path)
+
+# if $opath is empty return silently (e.g. scheme tape)
+[ -z "$opath" ] && return 0
+
+mkdir -p $v -m0750 "${opath}" >&2
+StopIfError "Could not mkdir '${opath}'"

usr/share/rear/output/default/25_create_lock.sh

@@ -0,0 +1,16 @@
+# create a lockfile in $OUTPUT_PREFIX to avoid that mkrescue overwrites ISO/PXE/LOGFILE
+# made by a previous mkrescue run when the variable KEEP_OLD_OUTPUT_COPY has been set
+
+# do not do this for tapes and special attention for file:///path
+url="$( echo $stage | tr '[:lower:]' '[:upper:]')_URL"
+local scheme=$(url_scheme ${!url})
+local path=$(url_path ${!url})
+local opath=$(output_path $scheme $path)
+
+# if $opath is empty return silently (e.g. scheme tape)
+[ -z "$opath" ] && return 0
+
+if test -d "${opath}" ; then
+        > "${opath}/.lockfile"
+        StopIfError "Could not create '${opath}/.lockfile'"
+fi

usr/share/rear/output/NETFS/default/95_copy_result_files.sh → usr/share/rear/output/default/95_copy_result_files.sh

@@ -1,5 +1,5 @@
 #
-# copy resulting files to network backup location
+# copy resulting files to network output location
 
 local scheme=$(url_scheme $OUTPUT_URL)
 local path=$(url_path $OUTPUT_URL)

usr/share/rear/output/default/97_remove_lock.sh

@@ -0,0 +1,9 @@
+# remove the lockfile
+local scheme=$(url_scheme $OUTPUT_URL)
+local path=$(url_path $OUTPUT_URL)
+local opath=$(output_path $scheme $path)
+
+# if $opath is empty return silently (e.g. scheme tape)
+[ -z "$opath" ] && return 0
+
+rm -f $v "${opath}/.lockfile" >&2

usr/share/rear/prep/NETFS/default/07_set_backup_archive.sh

@@ -6,7 +6,7 @@ case "$TAPE_DEVICE:$scheme" in
     (:file)
         # define the output path according to the scheme
         local path=$(url_path $BACKUP_URL)
-        local opath=$(output_path $scheme $path)
+        local opath=$(backup_path $scheme $path)
         backuparchive="${opath}/${BACKUP_PROG_ARCHIVE}${BACKUP_PROG_SUFFIX}${BACKUP_PROG_COMPRESS_SUFFIX}"
         ;;
     (:*)