From 15c57f01bc1875d9965478890036b0e0d488b6ad Mon Sep 17 00:00:00 2001
From: "Slawomir Wojciech Wojtczak (vermaden)" <vermaden@interia.pl>
Date: Wed, 31 Oct 2012 13:42:29 +0100
Subject: [PATCH] Make use of TMPDIR when using  mktemp(1). Minor fixes and
 changes at automatic generated mountpoint removal.

---
 beadm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/beadm b/beadm
index e9c3676..8a1a7b4 100755
--- a/beadm
+++ b/beadm
@@ -426,7 +426,7 @@ case ${1} in
       # do not change root (/) mounted boot environment mountpoint
       if [ "${ROOTFS}" != "${POOL}/ROOT/${2}" ]
       then
-        TMPMNT=$( mktemp -d /tmp/BE-${2}.XXXXXX )
+        TMPMNT=$( mktemp -d -t BE-${2} )
         if ! mkdir -p ${TMPMNT} 2> /dev/null
         then
           echo "ERROR: Cannot create '${TMPMNT}' directory"
@@ -642,7 +642,7 @@ EOF
   (mount) # ------------------------------------------------------------
     if [ ${#} -eq 2 ]
     then
-      TARGET=$( mktemp -d /tmp/BE-${2}.XXXXXX )
+      TARGET=$( mktemp -d -t BE-${2} )
     elif [ ${#} -eq 3 ]
     then
       TARGET=${3}
@@ -736,7 +736,7 @@ EOF
         done
     echo "Unmounted successfully"
     # only delete the temporary mountpoint directory
-    if echo "${MOUNTPOINT}" | grep -q "/tmp/BE-${2}." 1> /dev/null 2> /dev/null
+    if echo "${MOUNTPOINT}" | grep -q -E "/BE-${2}\.[a-zA-Z0-9]{8}" 1> /dev/null 2> /dev/null
     then
       # delete only when it is an empty directory
       if [ $( find ${MOUNTPOINT} | head | wc -l | bc ) -eq 1 ]