summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2012-06-16 16:21:55 +0200
committerPierre Schmitz <pierre@archlinux.de>2012-06-16 16:21:55 +0200
commit246b8ead603db3c1a8bbc0ae1a0007bda3821c6c (patch)
tree40e3bec5d922dd2258c2636e72f42ad87cd2a484
parentb14a1b1bcc677637e135f4bfcbde65914d3e2f82 (diff)
downloaddevtools-246b8ead603db3c1a8bbc0ae1a0007bda3821c6c.tar.xz
mkarchroot: reset trap so it wont be called twice
-rw-r--r--lib/common.sh2
-rw-r--r--mkarchroot.in1
2 files changed, 2 insertions, 1 deletions
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"