From 246b8ead603db3c1a8bbc0ae1a0007bda3821c6c Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 16 Jun 2012 16:21:55 +0200 Subject: mkarchroot: reset trap so it wont be called twice --- lib/common.sh | 2 +- mkarchroot.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/common.sh b/lib/common.sh index 6bbf6de..5c144e2 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -62,7 +62,7 @@ setup_workdir() { } cleanup() { - trap - EXIT INT QUIT TERM + trap - EXIT INT QUIT TERM HUP [[ -n $WORKDIR ]] && rm -rf "$WORKDIR" [[ $1 ]] && exit $1 diff --git a/mkarchroot.in b/mkarchroot.in index c826b0a..5bcde76 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -153,6 +153,7 @@ copy_hostconf () { } chroot_umount () { + trap - EXIT INT QUIT TERM HUP umount "${working_dir}/proc/sys" umount "${working_dir}/proc" umount "${working_dir}/sys" -- cgit v1.2.3-54-g00ecf