From fe36d782ca7965c0f2927777d0ef6677ab7fd064 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 14 May 2010 15:17:58 +0200 Subject: [PATCH] xbps_chroot_handler: do not umount, leave this to the signal handler of xbps-src. --- xbps-src/libexec/xbps-src-chroot-helper.sh.in | 3 --- xbps-src/shutils/chroot.sh.in | 8 -------- 2 files changed, 11 deletions(-) diff --git a/xbps-src/libexec/xbps-src-chroot-helper.sh.in b/xbps-src/libexec/xbps-src-chroot-helper.sh.in index d4ac67a411b..3d3f0c9ec33 100644 --- a/xbps-src/libexec/xbps-src-chroot-helper.sh.in +++ b/xbps-src/libexec/xbps-src-chroot-helper.sh.in @@ -32,9 +32,6 @@ if [ -n "${MASTERDIR}" ]; then export XBPS_MASTERDIR="${MASTERDIR}" fi -# Umount stuff if SIGINT or SIGQUIT was caught -trap umount_chroot_fs INT QUIT - REQFS="sys proc dev xbps" mount_chroot_fs() diff --git a/xbps-src/shutils/chroot.sh.in b/xbps-src/shutils/chroot.sh.in index b6fb6067aad..04fe7beb4ce 100644 --- a/xbps-src/shutils/chroot.sh.in +++ b/xbps-src/shutils/chroot.sh.in @@ -222,13 +222,6 @@ _mount() return $? } -_umount() -{ - MASTERDIR="${XBPS_MASTERDIR}" ${sudo_cmd} \ - @@XBPS_INSTALL_LIBEXECDIR@@/xbps-src-chroot-helper umount - return $? -} - xbps_chroot_handler() { local action="$1" @@ -277,7 +270,6 @@ xbps_chroot_handler() fi msg_normal "Exiting from the chroot on $XBPS_MASTERDIR." - _umount return $? }