sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (2d030b788aac48cae3ee434ae4587ad3aea8bb79)
- From: David Brown <scm AT mail.sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (2d030b788aac48cae3ee434ae4587ad3aea8bb79)
- Date: Tue, 28 Nov 2006 15:13:42 -0600
GIT changes to devel-stage-root sorcery by David Brown <dmlb2000 AT gmail.com>:
var/lib/sorcery/modules/libgrimoire | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 2d030b788aac48cae3ee434ae4587ad3aea8bb79
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
added recursive mount check to rm_source_dir so having castfs mounted
under deaddir should not happen anymore
diff --git a/var/lib/sorcery/modules/libgrimoire
b/var/lib/sorcery/modules/libgrimoire
index 3c8134e..e17d365 100755
--- a/var/lib/sorcery/modules/libgrimoire
+++ b/var/lib/sorcery/modules/libgrimoire
@@ -71,7 +71,19 @@ function real_rm_source_dir() {
pushd $BUILD_DIRECTORY 2>&1 > /dev/null
- umount -l $DEAD_DIR 2> /dev/null
+
+ # make sure nothing recursive is mounted under deaddir
+ mount |
+ while read line
+ do
+ local mount=$(echo $line | cut -d' ' -f1)
+ local mountloc=$(echo $line | cut -d' ' -f3)
+ if echo $mountloc | grep -q "^$DEAD_DIR"
+ then
+ debug "libgrimoire" "Unmounting $mount on $mountloc"
+ umount -l $mountloc 2> /dev/null
+ fi
+ done
# We don't really want to use "rm -rf", but if not using tmpfs,
# we have to. So we move the old dir to a known place before
- [SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (2d030b788aac48cae3ee434ae4587ad3aea8bb79), David Brown, 11/28/2006
Archive powered by MHonArc 2.6.24.