X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=mkrescue;h=784c4811dbba9381eb4304bad286ec6c6527b0a3;hb=e3b1f4be63d41f49c53b92a259e3c4c2feb651e2;hp=39b13be6b7c7c4f7d91cc5d46e74be8610e5c9f1;hpb=23c77cc092dbbb1e12c47c2b0021d4476b543702;p=rrq%2Fmaintain_lilo.git

diff --git a/mkrescue b/mkrescue
index 39b13be..784c481 100755
--- a/mkrescue
+++ b/mkrescue
@@ -96,11 +96,17 @@ fi
 compact=-c
 device=/dev/fd0
 fs=ext2
-tmpbase=${TMPDIR:-/tmp}/mkrescue_$$
-mount=`mktemp -d -t mkrescue-flp.XXXXXX` || { echo "$0: Cannot create temporary directory" >&2; exit 1; }
-mfile=`mktemp -t mkrescue-emu.XXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
-mtemp=`mktemp -t mkrescue-tmp.XXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
-trap " [ \"$debug\" != true ] && rm -f \"$mtemp\" ;  /bin/rm -rf -- \"$mount\" \"$mfile\" " 0 1 2 3 13 15
+tmpbase="`mktemp -dt $(basename $0).XXXXXXXXXX`" || exit
+if [ "$debug" != true ]; then
+        trap 'rm -rf -- "$tmpbase"' EXIT
+        trap 'trap - EXIT; rm -rf -- "$tmpbase"; exit 1' HUP INT QUIT TERM
+fi
+mount="$tmpbase/mkrescue-flp"
+mfile="$tmpbase/mkrescue-emu"
+mtemp="$tmpbase/mkrescue-tmp"
+mkdir "$mount"
+touch "$mfile" "$mtemp"
+
 loopback=loop0
 looppart=loop1
 install=text