From ef7ed3d27708b425aec80b5d67cad370a26ff1dc Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 26 Jun 2017 21:54:22 +0200 Subject: bin/db-update, bin/common-functions: umount -l instead of umount [-f] --- bin/common-functions | 4 ++-- bin/db-update | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bin/common-functions b/bin/common-functions index a6069eb..255da56 100755 --- a/bin/common-functions +++ b/bin/common-functions @@ -215,13 +215,13 @@ generate_package_metadata() { --register=no \ ${base_dir}/bin/mksrcinfo - sudo umount -f "${overlays_dir}/merged" + sudo umount -l "${overlays_dir}/merged" mv \ "${overlays_dir}/upper/.SRCINFO" \ "${file_prefix}.SRCINFO" - sudo umount -f "${overlays_dir}" + sudo umount -l "${overlays_dir}" rmdir "${overlays_dir}" # otherwise this just calls for trouble diff --git a/bin/db-update b/bin/db-update index a67a3fc..5457dcb 100755 --- a/bin/db-update +++ b/bin/db-update @@ -369,14 +369,13 @@ fi tmp_dir="$(mktemp -d)" clean_up_lock_file() { - echo sudo /usr/bin/umount "${master_mirror_sshfs}" - sudo /usr/bin/umount "${master_mirror_sshfs}" + sudo /usr/bin/umount -l "${master_mirror_sshfs}" rm -f "${package_database_lock_file}" "${build_list_lock_file}" rm -rf --one-file-system "${tmp_dir}" } if mountpoint "${master_mirror_sshfs}" > /dev/null 2>&1; then - sudo /usr/bin/umount "${master_mirror_sshfs}" + sudo /usr/bin/umount -l "${master_mirror_sshfs}" fi mount "${master_mirror_sshfs}" -- cgit v1.2.3-54-g00ecf