diff --git a/usr/share/rear/backup/DUPLICITY/default/100_mount_duplicity_path.sh b/usr/share/rear/backup/DUPLICITY/default/100_mount_duplicity_path.sh

index 64b7a792..6ba7d543 100644

--- a/usr/share/rear/backup/DUPLICITY/default/100_mount_duplicity_path.sh

+++ b/usr/share/rear/backup/DUPLICITY/default/100_mount_duplicity_path.sh

@@ -1,10 +1,4 @@

-# create mount point

 if [ -n "$BACKUP_DUPLICITY_NETFS_URL" -o -n "$BACKUP_DUPLICITY_NETFS_MOUNTCMD" ]; then

-	mkdir -p $v "$BUILD_DIR/outputfs" >&2

-	StopIfError "Could not mkdir '$BUILD_DIR/outputfs'"

-

-	AddExitTask "rmdir $v $BUILD_DIR/outputfs >&2"

-

 	if [[ "$BACKUP_DUPLICITY_NETFS_MOUNTCMD" ]] ; then

 		BACKUP_DUPLICITY_NETFS_URL="var://BACKUP_DUPLICITY_NETFS_MOUNTCMD"

 	fi

diff --git a/usr/share/rear/backup/DUPLICITY/default/980_unmount_duplicity_path.sh b/usr/share/rear/backup/DUPLICITY/default/980_unmount_duplicity_path.sh

index 185dbd95..8525ab1d 100644

--- a/usr/share/rear/backup/DUPLICITY/default/980_unmount_duplicity_path.sh

+++ b/usr/share/rear/backup/DUPLICITY/default/980_unmount_duplicity_path.sh

@@ -6,10 +6,4 @@ if [  -n "$BACKUP_DUPLICITY_NETFS_URL" -o -n "$BACKUP_DUPLICITY_NETFS_UMOUNTCMD"

 	fi

 	umount_url $BACKUP_DUPLICITY_NETFS_URL $BUILD_DIR/outputfs

-

-	rmdir $v $BUILD_DIR/outputfs >&2

-	if [[ $? -eq 0 ]] ; then

-		# the argument to RemoveExitTask has to be identical to the one given to AddExitTask

-		RemoveExitTask "rmdir $v $BUILD_DIR/outputfs >&2"

-	fi

 fi

diff --git a/usr/share/rear/backup/NETFS/default/100_mount_NETFS_path.sh b/usr/share/rear/backup/NETFS/default/100_mount_NETFS_path.sh

index 5c7696db..b6a955db 100644

--- a/usr/share/rear/backup/NETFS/default/100_mount_NETFS_path.sh

+++ b/usr/share/rear/backup/NETFS/default/100_mount_NETFS_path.sh

@@ -1,9 +1,3 @@

-# create mount point

-mkdir -p $v "$BUILD_DIR/outputfs" >&2

-StopIfError "Could not mkdir '$BUILD_DIR/outputfs'"

-

-AddExitTask "rmdir $v $BUILD_DIR/outputfs >&2"

-

 if [[ "$BACKUP_MOUNTCMD" ]] ; then

     BACKUP_URL="var://BACKUP_MOUNTCMD"

 fi

diff --git a/usr/share/rear/backup/NETFS/default/150_save_copy_of_prefix_dir.sh b/usr/share/rear/backup/NETFS/default/150_save_copy_of_prefix_dir.sh

index d79653b4..9bf8f76a 100644

--- a/usr/share/rear/backup/NETFS/default/150_save_copy_of_prefix_dir.sh

+++ b/usr/share/rear/backup/NETFS/default/150_save_copy_of_prefix_dir.sh

@@ -3,20 +3,17 @@

 [ -z "${NETFS_KEEP_OLD_BACKUP_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=$(backup_path $scheme $path)

+local scheme=$( url_scheme $BACKUP_URL )

+local path=$( url_path $BACKUP_URL )

+local opath=$( backup_path $scheme $path )

 # if $opath is empty return silently (e.g. scheme tape)

 [ -z "$opath" ] && return 0

 if ! test -f "${opath}/.lockfile" ; then

     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}'"

+        rm -rf $v "${opath}.old" || Error "Could not remove '${opath}.old'"

+        mv -f $v "${opath}" "${opath}.old" || Error "Could not move '${opath}'"

     fi

 else

     # lockfile was already made through the output workflow (hands off)

diff --git a/usr/share/rear/backup/NETFS/default/200_make_prefix_dir.sh b/usr/share/rear/backup/NETFS/default/200_make_prefix_dir.sh

index db15bca2..43f5b651 100644

--- a/usr/share/rear/backup/NETFS/default/200_make_prefix_dir.sh

+++ b/usr/share/rear/backup/NETFS/default/200_make_prefix_dir.sh

@@ -2,13 +2,14 @@

 # 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=$(backup_path $scheme $path)

+local scheme=$( url_scheme $BACKUP_URL )

+local path=$( url_path $BACKUP_URL )

+local opath=$( backup_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}'"

+mkdir -p $v -m0750 "${opath}" && return

+

+# A failure to create the $NETFS_PREFIX sub-directory is fatal:

+Error "Failed to create '$opath' directory for BACKUP_URL=$BACKUP_URL"

diff --git a/usr/share/rear/backup/NETFS/default/250_create_lock.sh b/usr/share/rear/backup/NETFS/default/250_create_lock.sh

index 59090a22..36d547ec 100644

--- a/usr/share/rear/backup/NETFS/default/250_create_lock.sh

+++ b/usr/share/rear/backup/NETFS/default/250_create_lock.sh

@@ -2,15 +2,13 @@

 # made by a previous mkbackup run when the variable NETFS_KEEP_OLD_BACKUP_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=$(backup_path $scheme $path)

+local scheme=$( url_scheme $BACKUP_URL )

+local path=$( url_path $BACKUP_URL )

+local opath=$( backup_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'"

+	> "${opath}/.lockfile" || Error "Could not create '${opath}/.lockfile'"

 fi

diff --git a/usr/share/rear/backup/NETFS/default/970_remove_lock.sh b/usr/share/rear/backup/NETFS/default/970_remove_lock.sh

index f69f7bd8..7038f5b9 100644

--- a/usr/share/rear/backup/NETFS/default/970_remove_lock.sh

+++ b/usr/share/rear/backup/NETFS/default/970_remove_lock.sh

@@ -1,8 +1,7 @@

 # remove the lockfile

-url="$( echo $stage | tr '[:lower:]' '[:upper:]')_URL"

-local scheme=$(url_scheme ${!url})

-local path=$(url_path ${!url})

-local opath=$(backup_path $scheme $path)

+local scheme=$( url_scheme $BACKUP_URL )

+local path=$( url_path $BACKUP_URL )

+local opath=$( backup_path $scheme $path )

 # if $opath is empty return silently (e.g. scheme tape)

 [ -z "$opath" ] && return 0

diff --git a/usr/share/rear/backup/NETFS/default/980_umount_NETFS_dir.sh b/usr/share/rear/backup/NETFS/default/980_umount_NETFS_dir.sh

index f28c6cbf..e1954dc5 100644

--- a/usr/share/rear/backup/NETFS/default/980_umount_NETFS_dir.sh

+++ b/usr/share/rear/backup/NETFS/default/980_umount_NETFS_dir.sh

@@ -5,9 +5,3 @@ if [[ "$BACKUP_UMOUNTCMD" ]] ; then

 fi

 umount_url $BACKUP_URL $BUILD_DIR/outputfs

-

-rmdir $v $BUILD_DIR/outputfs >&2

-if [[ $? -eq 0 ]] ; then

-    # the argument to RemoveExitTask has to be identical to the one given to AddExitTask

-    RemoveExitTask "rmdir $v $BUILD_DIR/outputfs >&2"

-fi

diff --git a/usr/share/rear/backup/YUM/default/400_create_include_exclude_files.sh b/usr/share/rear/backup/YUM/default/400_create_include_exclude_files.sh

deleted file mode 100644

index 6111f89b..00000000

--- a/usr/share/rear/backup/YUM/default/400_create_include_exclude_files.sh

+++ /dev/null

@@ -1,33 +0,0 @@

-

-# Backup all that is explicitly specified in BACKUP_PROG_INCLUDE:

-for backup_include_item in "${BACKUP_PROG_INCLUDE[@]}" ; do

-    test "$backup_include_item" && echo "$backup_include_item"

-done > $TMP_DIR/backup-include.txt

-

-# Implicitly also backup all local filesystems as defined in mountpoint_device

-# except BACKUP_ONLY_INCLUDE or MANUAL_INCLUDE is set:

-if ! is_true "$BACKUP_ONLY_INCLUDE" ; then

-    if [ "${MANUAL_INCLUDE:-NO}" != "YES" ] ; then

-        # Add the mountpoints that will be recovered to the backup include list

-        # unless a mountpoint is excluded:

-        while read mountpoint device junk ; do

-            if ! IsInArray "$mountpoint" "${EXCLUDE_MOUNTPOINTS[@]}" ; then

-                echo "$mountpoint"

-            fi

-        done <"$VAR_DIR/recovery/mountpoint_device" >> $TMP_DIR/backup-include.txt

-    fi

-fi

-

-# Exclude all that is explicitly specified in BACKUP_PROG_EXCLUDE:

-for backup_exclude_item in "${BACKUP_PROG_EXCLUDE[@]}" ; do

-    test "$backup_exclude_item" && echo "$backup_exclude_item"

-done > $TMP_DIR/backup-exclude.txt

-

-# Implicitly also add excluded mountpoints to the backup exclude list

-# except BACKUP_ONLY_EXCLUDE is set:

-if ! is_true "$BACKUP_ONLY_EXCLUDE" ; then

-    for excluded_mountpoint in "${EXCLUDE_MOUNTPOINTS[@]}" ; do

-        test "$excluded_mountpoint" && echo "$excluded_mountpoint/"

-    done >> $TMP_DIR/backup-exclude.txt

-fi

-

diff --git a/usr/share/rear/backup/YUM/default/400_create_include_exclude_files.sh b/usr/share/rear/backup/YUM/default/400_create_include_exclude_files.sh

new file mode 120000

index 00000000..d8d12c0b

--- /dev/null

+++ b/usr/share/rear/backup/YUM/default/400_create_include_exclude_files.sh

@@ -0,0 +1 @@

+../../NETFS/default/400_create_include_exclude_files.sh

\ No newline at end of file

diff --git a/usr/share/rear/build/YUM/default/600_create_python_symlink.sh b/usr/share/rear/build/YUM/default/600_create_python_symlink.sh

deleted file mode 100644

index 29d85905..00000000

--- a/usr/share/rear/build/YUM/default/600_create_python_symlink.sh

+++ /dev/null

@@ -1,14 +0,0 @@

-# Copied from ../../DUPLICITY/default/600_create_python_symlink.sh for YUM

-# make sure we have a symbolic link to the python binary

-(

-    cd  $ROOTFS_DIR/bin

-    for py in $(find . -name "python*" )

-    do

-        this_py=${py#./*}   # should be without ./

-        case $this_py in

-            python) break ;;

-            python2*|python3*) ln -sf $v $this_py python >&2 ;;

-        esac

-    done

-)

-

diff --git a/usr/share/rear/build/YUM/default/600_create_python_symlink.sh b/usr/share/rear/build/YUM/default/600_create_python_symlink.sh

new file mode 120000

index 00000000..d776e5aa

--- /dev/null

+++ b/usr/share/rear/build/YUM/default/600_create_python_symlink.sh

@@ -0,0 +1 @@

+../../DUPLICITY/default/600_create_python_symlink.sh

\ No newline at end of file

diff --git a/usr/share/rear/lib/framework-functions.sh b/usr/share/rear/lib/framework-functions.sh

index f245861a..b5324747 100644

--- a/usr/share/rear/lib/framework-functions.sh

+++ b/usr/share/rear/lib/framework-functions.sh

@@ -122,7 +122,7 @@ function cleanup_build_area_and_end_program () {

     # Cleanup build area

     Log "Finished in $((SECONDS-STARTTIME)) seconds"

     if is_true "$KEEP_BUILD_DIR" ; then

-        LogPrint "You should also rm -Rf $BUILD_DIR"

+        LogPrint "You should also rm -Rf --one-file-system $BUILD_DIR"

     else

         Log "Removing build area $BUILD_DIR"

         rm -Rf $TMP_DIR

@@ -132,15 +132,11 @@ function cleanup_build_area_and_end_program () {

         # in worst case it could not umount; so before remove the BUILD_DIR check if above outputfs is gone

         if mountpoint -q "$BUILD_DIR/outputfs" ; then

             # still mounted it seems

-            LogPrint "Directory $BUILD_DIR/outputfs still mounted - trying lazy umount"

             sleep 2

-            umount -f -l $BUILD_DIR/outputfs >&2

-            rm -Rf $v $BUILD_DIR/outputfs >&2

-        else

-            # not mounted so we can safely delete $BUILD_DIR/outputfs

-            rm -Rf $BUILD_DIR/outputfs

+            umount_mountpoint_lazy $BUILD_DIR/outputfs

         fi

-        rm -Rf $v $BUILD_DIR >&2

+        remove_temporary_mountpoint '$BUILD_DIR/outputfs' || BugError "Directory $BUILD_DIR/outputfs not empty, can not remove"

+        rmdir $v $BUILD_DIR >&2

     fi

     Log "End of program reached"

 }

diff --git a/usr/share/rear/lib/global-functions.sh b/usr/share/rear/lib/global-functions.sh

index 4264bb53..a1aec604 100644

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

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

@@ -342,7 +342,44 @@ function url_path() {

     echo /${url_without_scheme#*/}

 }

-backup_path() {

+### Returns true if one can upload files to the URL

+function scheme_accepts_files() {

+    local scheme=$1

+    case $scheme in

+        (null|tape|obdr)

+            # tapes do not support uploading arbitrary files, one has to handle them

+            # as special case (usually passing the tape device as argument to tar)

+            # null means do not upload anything anywhere, leave the files under /var/lib/rear/output

+            return 1

+            ;;

+        (*)

+            # most URL schemes support uploading files

+            return 0

+            ;;

+    esac

+}

+

+### Returns true if URLs with the given scheme corresponds to a path inside

+### a mountable fileystem and one can put files directly into it.

+### The actual path will be returned by backup_path() / output_path().

+### If returns false, using backup_path() / output_path() has no sense

+### and one must use a scheme-specific method (like lftp or writing them to a tape)

+### to upload files to the destination instead of just "cp" or other direct filesystem access.

+### Returning true does not imply that the URL is currently mounted at a filesystem and usable,

+### only that it can be mounted (use mount_url() first)

+function scheme_supports_filesystem() {

+    local scheme=$1

+    case $scheme in

+        (null|tape|obdr|rsync|fish|ftp|ftps|hftp|http|https|sftp)

+            return 1

+            ;;

+        (*)

+            return 0

+            ;;

+    esac

+}

+

+function backup_path() {

     local scheme=$1

     local path=$2

     case $scheme in

@@ -368,13 +405,21 @@ backup_path() {

     echo "$path"

 }

-output_path() {

+function output_path() {

     local scheme=$1

     local path=$2

+

+    # Abort for unmountable schemes ("tape-like" or "ftp-like" schemes).

+    # Returning an empty string for them is not satisfactory: it could lead to caller putting its files

+    # under / instead of the intended location if the result is not checked for emptiness.

+    # Returning ${BUILD_DIR}/outputfs/${OUTPUT_PREFIX} for unmountable URLs is also not satisfactory:

+    # caller could put its files there expecting them to be safely at their destination,

+    # but if the directory is not a mountpoint, they would get silently lost.

+    # The caller needs to check the URL/scheme using scheme_supports_filesystem()

+    # before calling this function.

+    scheme_supports_filesystem $scheme || BugError "output_path() called with scheme $scheme that does not support filesystem access"

+

     case $scheme in

-       (null|tape)  # no path for tape required

-           path=""

-           ;;

        (file)  # type file needs a local path (must be mounted by user)

            path="$path/${OUTPUT_PREFIX}"

            ;;

@@ -387,17 +432,33 @@ output_path() {

 ### Mount URL $1 at mountpoint $2[, with options $3]

-mount_url() {

+function mount_url() {

     local url=$1

     local mountpoint=$2

     local defaultoptions="rw,noatime"

     local options=${3:-"$defaultoptions"}

+    local scheme

+

+    scheme=$( url_scheme $url )

+

+    # The cases where we return 0 are those that do not need umount and also do not need ExitTask handling.

+    # They thus need to be kept in sync with umount_url() so that RemoveExitTasks is used

+    # iff AddExitTask was used in mount_url().

+

+    if ! scheme_supports_filesystem $scheme ; then

+        ### Stuff like null|tape|rsync|fish|ftp|ftps|hftp|http|https|sftp

+        ### Don't need to umount anything for these.

+        ### file: supports filesystem access, but is not mounted and unmounted,

+        ### so it has to be handled specially below.

+        ### Similarly for iso: which gets mounted and unmounted only during recovery.

+        return 0

+    fi

     ### Generate a mount command

     local mount_cmd

-    case $(url_scheme $url) in

-        (null|tape|file|rsync|fish|ftp|ftps|hftp|http|https|sftp)

-            ### Don't need to mount anything for these

+    case $scheme in

+        (file)

+            ### Don't need to mount anything for file:, it is already mounted by user

             return 0

             ;;

         (iso)

@@ -558,22 +619,47 @@ mount_url() {

             ;;

     esac

+    # create mount point

+    mkdir -p $v "$mountpoint" || Error "Could not mkdir '$mountpoint'"

+    AddExitTask "remove_temporary_mountpoint '$mountpoint'"

+

     Log "Mounting with '$mount_cmd'"

     # eval is required when mount_cmd contains single quoted stuff (e.g. see the above mount_cmd for curlftpfs)

     eval $mount_cmd || Error "Mount command '$mount_cmd' failed."

-    AddExitTask "umount -f $v '$mountpoint' >&2"

+    AddExitTask "perform_umount_url '$url' '$mountpoint' lazy"

     return 0

 }

-### Unmount url $1 at mountpoint $2

-umount_url() {

+function remove_temporary_mountpoint() {

+    if test -d "$1" ; then

+        rmdir $v "$1"

+    fi

+}

+

+### Unmount url $1 at mountpoint $2, perform mountpoint cleanup and exit task + error handling

+function umount_url() {

     local url=$1

     local mountpoint=$2

+    local scheme

-    case $(url_scheme $url) in

-        (null|tape|file|rsync|fish|ftp|ftps|hftp|http|https|sftp)

-            ### Don't need to umount anything for these

+    scheme=$( url_scheme $url )

+

+    # The cases where we return 0 are those that do not need umount and also do not need ExitTask handling.

+    # They thus need to be kept in sync with mount_url() so that RemoveExitTasks is used

+    # iff AddExitTask was used in mount_url().

+

+    if ! scheme_supports_filesystem $scheme ; then

+        ### Stuff like null|tape|rsync|fish|ftp|ftps|hftp|http|https|sftp

+        ### Don't need to umount anything for these.

+        ### file: supports filesystem access, but is not mounted and unmounted,

+        ### so it has to be handled specially below.

+        ### Similarly for iso: which gets mounted and unmounted only during recovery.

+        return 0

+    fi

+

+    case $scheme in

+        (file)

             return 0

             ;;

         (iso)

@@ -581,42 +667,106 @@ umount_url() {

                 return 0

             fi

             ;;

-	    (sshfs)

-	        umount_cmd="fusermount -u $mountpoint"

-	    ;;

-	    (davfs)

-	        umount_cmd="umount $mountpoint"

-            # Wait for 3 sek. then remove the cache-dir /var/cache/davfs

-            sleep 30

-            # ToDo: put in here the cache-dir from /etc/davfs2/davfs.conf

-            # and delete only the just used cache

-            #rm -rf /var/cache/davfs2/*<mountpoint-hash>*

-            rm -rf /var/cache/davfs2/*outputfs*

-

-	    ;;

-        (var)

-            local var=$(url_host $url)

-            umount_cmd="${!var} $mountpoint"

+        (*)

+            # Schemes that actually need nontrivial umount are handled below.

+            # We do not handle them in the default branch because in the case of iso:

+            # it depends on the current workflow whether umount is needed or not.

+            :

+    esac

-            Log "Unmounting with '$umount_cmd'"

-            $umount_cmd

-            StopIfError "Unmounting failed."

+    # umount_url() is a wrapper that takes care of exit tasks and error handling and mountpoint cleanup.

+    # Therefore it also determines if exit task and mountpoint handling is required and returns early if not.

+    # The actual umount job is performed inside perform_umount_url().

+    # We do not request lazy umount here because we want umount errors to be reliably reported.

+    perform_umount_url $url $mountpoint || Error "Unmounting '$mountpoint' failed."

-            RemoveExitTask "umount -f $v '$mountpoint' >&2"

-            return 0

+    RemoveExitTask "perform_umount_url '$url' '$mountpoint' lazy"

+

+    remove_temporary_mountpoint '$mountpoint' && RemoveExitTask "remove_temporary_mountpoint '$mountpoint'"

+    return 0

+}

+

+### Unmount url $1 at mountpoint $2 [ lazily if $3 is set to 'lazy' and normal unmount fails ]

+function perform_umount_url() {

+    local url=$1

+    local mountpoint=$2

+    local lazy=${3:-}

+

+    if test $lazy ; then

+        if test $lazy != "lazy" ; then

+            BugError "lazy = $lazy, but it must have the value of 'lazy' or empty"

+        fi

+    fi

+

+    case $(url_scheme $url) in

+        (sshfs)

+            # does ftpfs need this special case as well?

+            fusermount -u ${lazy:+'-z'} $mountpoint

+            ;;

+        (davfs)

+            umount_davfs $mountpoint $lazy

+            ;;

+        (var)

+            local var

+            var=$(url_host $url)

+            Log "Unmounting with '${!var} $mountpoint'"

+            # lazy unmount not supported with custom umount command

+            ${!var} $mountpoint

             ;;

+        (*)

+            # usual umount command

+            umount_mountpoint $mountpoint $lazy

     esac

+    # The switch above must be the last statement in this function and the umount commands must be

+    # the last commands (or part of) in each branch. This ensures proper exit code propagation

+    # to the caller even when set -e is used.

+}

-    umount_mountpoint $mountpoint

-    StopIfError "Unmounting '$mountpoint' failed."

+### Helper which unmounts davfs mountpoint $1 and cleans up the cache,

+### performing lazy unmount if $2 = 'lazy' and normal unmount fails.

+function umount_davfs() {

+    local mountpoint=$1

+    local lazy="${2:-}"

-    RemoveExitTask "umount -f $v '$mountpoint' >&2"

-    return 0

+    if test $lazy ; then

+        if test $lazy != "lazy" ; then

+            BugError "lazy = $lazy, but it must have the value of 'lazy' or empty"

+        fi

+    fi

+

+    if umount_mountpoint $mountpoint ; then

+        # Wait for 3 sek. then remove the cache-dir /var/cache/davfs

+        sleep 30

+        # TODO: put in here the cache-dir from /etc/davfs2/davfs.conf

+        # and delete only the just used cache

+        #rm -rf /var/cache/davfs2/*<mountpoint-hash>*

+        rm -rf /var/cache/davfs2/*outputfs*

+    else

+        local retval=$?

+

+        if test $lazy ; then

+            # try again to unmount lazily and this time do not delete the cache, it is still in use.

+            LogPrintError "davfs cache /var/cache/davfs2/*outputfs* needs to be cleaned up manually after the lazy unmount finishes"

+            umount_mountpoint_lazy $mountpoint

+        else

+            # propagate errors from umount

+            return $retval

+        fi

+    fi

 }

-### Unmount mountpoint $1

-umount_mountpoint() {

+### Unmount mountpoint $1 [ lazily if $2 = 'lazy' ]

+### Default implementation for filesystems that don't need anything fancy

+### For special umount commands use perform_umount_url()

+function umount_mountpoint() {

     local mountpoint=$1

+    local lazy=${2:-}

+

+    if test $lazy ; then

+        if test $lazy != "lazy" ; then

+            BugError "lazy = $lazy, but it must have the value of 'lazy' or empty"

+        fi

+    fi

     ### First, try a normal unmount,

     Log "Unmounting '$mountpoint'"

@@ -636,7 +786,21 @@ umount_mountpoint() {

     fi

     Log "Unmounting '$mountpoint' failed."

-    return 1

+

+    if test $lazy ; then

+        umount_mountpoint_lazy $mountpoint

+    else

+        return 1

+    fi

+}

+

+### Unmount mountpoint $1 lazily

+### Preferably use "umount_mountpoint $mountpoint lazy", which attempts non-lazy unmount first.

+function umount_mountpoint_lazy() {

+    local mountpoint=$1

+

+    LogPrint "Directory $mountpoint still mounted - trying lazy umount"

+    umount $v -f -l $mountpoint >&2

 }

 # Change $1 to user input or leave default value on empty input

diff --git a/usr/share/rear/output/PXE/default/800_copy_to_tftp.sh b/usr/share/rear/output/PXE/default/800_copy_to_tftp.sh

index a43dff13..3e7512ee 100644

--- a/usr/share/rear/output/PXE/default/800_copy_to_tftp.sh

+++ b/usr/share/rear/output/PXE/default/800_copy_to_tftp.sh

@@ -8,10 +8,12 @@

 if [[ ! -z "$PXE_TFTP_URL" ]] ; then

     # E.g. PXE_TFTP_URL=nfs://server/export/nfs/tftpboot

     local scheme=$( url_scheme $PXE_TFTP_URL )

-    local path=$( url_path $PXE_TFTP_URL )

-    mkdir -p $v "$BUILD_DIR/tftpbootfs" >&2

-    StopIfError "Could not mkdir '$BUILD_DIR/tftpbootfs'"

-    AddExitTask "rm -Rf $v $BUILD_DIR/tftpbootfs >&2"

+

+    # We need filesystem access to the destination (schemes like ftp:// are not supported)

+    if ! scheme_supports_filesystem $scheme ; then

+        Error "Scheme $scheme for PXE output not supported, use a scheme that supports mounting (like nfs: )"

+    fi

+

     mount_url $PXE_TFTP_URL $BUILD_DIR/tftpbootfs $BACKUP_OPTIONS

     # However, we copy under $OUTPUT_PREFIX_PXE directory (usually HOSTNAME) to have different clients on one pxe server

     PXE_TFTP_LOCAL_PATH=$BUILD_DIR/tftpbootfs

@@ -74,10 +76,6 @@ fi

 if [[ ! -z "$PXE_TFTP_URL" ]] ; then

     LogPrint "Copied kernel+initrd $( du -shc $KERNEL_FILE "$TMP_DIR/$REAR_INITRD_FILENAME" | tail -n 1 | tr -s "\t " " " | cut -d " " -f 1 ) to $PXE_TFTP_URL/$OUTPUT_PREFIX_PXE"

     umount_url $PXE_TFTP_URL $BUILD_DIR/tftpbootfs

-    rmdir $BUILD_DIR/tftpbootfs >&2

-    if [[ $? -eq 0 ]] ; then

-        RemoveExitTask "rm -Rf $v $BUILD_DIR/tftpbootfs >&2"

-    fi

 else

     # legacy way PXE_TFTP_PATH

     LogPrint "Copied kernel+initrd $( du -shc $KERNEL_FILE "$TMP_DIR/$REAR_INITRD_FILENAME" | tail -n 1 | tr -s "\t " " " | cut -d " " -f 1 ) to $PXE_TFTP_PATH"

diff --git a/usr/share/rear/output/PXE/default/810_create_pxelinux_cfg.sh b/usr/share/rear/output/PXE/default/810_create_pxelinux_cfg.sh

index fce4bcf1..5041a3bc 100644

--- a/usr/share/rear/output/PXE/default/810_create_pxelinux_cfg.sh

+++ b/usr/share/rear/output/PXE/default/810_create_pxelinux_cfg.sh

@@ -1,4 +1,4 @@

-# 81_create_pxelinux_cfg.sh

+# 810_create_pxelinux_cfg.sh

 #

 # create pxelinux config on PXE server for Relax-and-Recover

 #

@@ -11,10 +11,12 @@ if [[ ! -z "$PXE_CONFIG_URL" ]] ; then

     # E.g. PXE_CONFIG_URL=nfs://server/export/nfs/tftpboot/pxelinux.cfg

     # Better be sure that on 'server' the directory /export/nfs/tftpboot/pxelinux.cfg exists

     local scheme=$( url_scheme $PXE_CONFIG_URL )

-    local path=$( url_path $PXE_CONFIG_URL )

-    mkdir -p $v "$BUILD_DIR/tftpbootfs" >&2

-    StopIfError "Could not mkdir '$BUILD_DIR/tftpbootfs'"

-    AddExitTask "rm -Rf $v $BUILD_DIR/tftpbootfs >&2"

+

+    # We need filesystem access to the destination (schemes like ftp:// are not supported)

+    if ! scheme_supports_filesystem $scheme ; then

+        Error "Scheme $scheme for PXE output not supported, use a scheme that supports mounting (like nfs: )"

+    fi

+

     mount_url $PXE_CONFIG_URL $BUILD_DIR/tftpbootfs $BACKUP_OPTIONS

     PXE_LOCAL_PATH=$BUILD_DIR/tftpbootfs

 else

@@ -105,10 +107,6 @@ popd >/dev/null

 if [[ ! -z "$PXE_CONFIG_URL" ]] ; then

     LogPrint "Created pxelinux config '${PXE_CONFIG_PREFIX}$HOSTNAME' and symlinks for $PXE_CREATE_LINKS adresses in $PXE_CONFIG_URL"

     umount_url $PXE_TFTP_URL $BUILD_DIR/tftpbootfs

-    rmdir $BUILD_DIR/tftpbootfs >&2

-    if [[ $? -eq 0 ]] ; then

-        RemoveExitTask "rm -Rf $v $BUILD_DIR/tftpbootfs >&2"

-    fi

 else

     LogPrint "Created pxelinux config '${PXE_CONFIG_PREFIX}$HOSTNAME' and symlinks for $PXE_CREATE_LINKS adresses in $PXE_CONFIG_PATH"

     # Add to result files

diff --git a/usr/share/rear/output/PXE/default/820_copy_to_net.sh b/usr/share/rear/output/PXE/default/820_copy_to_net.sh

deleted file mode 100644

index 39cd316d..00000000

--- a/usr/share/rear/output/PXE/default/820_copy_to_net.sh

+++ /dev/null

@@ -1,41 +0,0 @@

-

-# 820_copy_to_net.sh

-

-# Check if we have a target location OUTPUT_URL

-test "$OUTPUT_URL" || return 0

-

-local scheme=$( url_scheme $OUTPUT_URL )

-local result_file=""

-local path=""

-

-case "$scheme" in

-    (nfs|cifs|usb|tape|file|davfs)

-        # The ISO has already been transferred by NETFS.

-        return 0

-        ;;

-    (fish|ftp|ftps|hftp|http|https|sftp)

-        LogPrint "Transferring PXE files to $OUTPUT_URL"

-        for result_file in "${RESULT_FILES[@]}" ; do

-            path=$(url_path $OUTPUT_URL)

-

-            # Make sure that destination directory exists, otherwise lftp would copy

-            # RESULT_FILES into last available directory in the path.

-            # e.g. OUTPUT_URL=sftp://<host_name>/iso/server1 and have "/iso/server1"

-            # directory missing, would upload RESULT_FILES into sftp://<host_name>/iso/

-            lftp -c "$OUTPUT_LFTP_OPTIONS; open $OUTPUT_URL; mkdir -fp ${path}"

-

-            LogPrint "Transferring file: $result_file"

-            lftp -c "$OUTPUT_LFTP_OPTIONS; open $OUTPUT_URL; mput $result_file" || Error "lftp failed to transfer '$result_file' to '$OUTPUT_URL' (lftp exit code: $?)"

-        done

-        ;;

-    (rsync)

-        LogPrint "Transferring PXE files to $OUTPUT_URL"

-        for result_file in "${RESULT_FILES[@]}" ; do

-            LogPrint "Transferring file: $result_file"

-            rsync -a $v "$result_file" "$OUTPUT_URL" || Error "Problem transferring '$result_file' to $OUTPUT_URL"

-        done

-        ;;

-    (*) Error "Invalid scheme '$scheme' in '$OUTPUT_URL'."

-        ;;

-esac

-

diff --git a/usr/share/rear/output/default/100_mount_output_path.sh b/usr/share/rear/output/default/100_mount_output_path.sh

index 22ef36de..34ea8e5e 100644

--- a/usr/share/rear/output/default/100_mount_output_path.sh

+++ b/usr/share/rear/output/default/100_mount_output_path.sh

@@ -1,9 +1,3 @@

-# create mount point

-mkdir -p $v "$BUILD_DIR/outputfs" >&2

-StopIfError "Could not mkdir '$BUILD_DIR/outputfs'"

-

-AddExitTask "rm -Rf $v $BUILD_DIR/outputfs >&2"

-

 if [[ "$OUTPUT_MOUNTCMD" ]] ; then

     OUTPUT_URL="var://$OUTPUT_MOUNTCMD"

 fi

diff --git a/usr/share/rear/output/default/150_save_copy_of_prefix_dir.sh b/usr/share/rear/output/default/150_save_copy_of_prefix_dir.sh

index 00339a96..06326114 100644

--- a/usr/share/rear/output/default/150_save_copy_of_prefix_dir.sh