tMerge pull request #53 from davinerd/fix_remove_mountpoint_51 - tomb - the crypto undertaker (HTM) git clone git://parazyd.org/tomb.git (DIR) Log (DIR) Files (DIR) Refs (DIR) README (DIR) LICENSE --- (DIR) commit 5d54a3b1212678dc725d63abfdc966684c175b46 (DIR) parent 262855fa10f0c4d060aad7ab6f902bd1992bffd8 (HTM) Author: Jaromil <jaromil@dyne.org> Date: Tue, 25 Oct 2011 15:14:29 -0700 Merge pull request #53 from davinerd/fix_remove_mountpoint_51 Removing default mount point when umounting the tomb Diffstat: M src/tomb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- (DIR) diff --git a/src/tomb b/src/tomb t@@ -954,8 +954,11 @@ umount_tomb() { umount ${tombmount} if ! [ $? = 0 ]; then error "Tomb is busy, cannot umount!" - else - rmdir ${tombmount} + else + # this means we used a "default" mount point + if [ "${tombmount}" = "/media/${tombname}.tomb" ]; then + rmdir ${tombmount} + fi fi fi