From e953895ae03d8f13fb4403cbe9fa1be8d5b67be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info>
Date: Thu, 15 Nov 2012 00:55:41 +0100
Subject: [PATCH] Fixed tmp (u)mount system
---
makepackage | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/makepackage b/makepackage
index a4f3812a..40b4212c 100644
--- a/makepackage
+++ b/makepackage
@@ -188,16 +188,12 @@ fi
}
tmpumount(){
- [ $MEM -lt 16000000 ] && return
- echo $PACKAGE | grep -q "linux" && return
- umount jails/$UPSTREAM-$ARCH/tmp && return
- fuser -k -m jails/$UPSTREAM-$ARCH/tmp
- umount jails/$UPSTREAM-$ARCH/tmp && return
+ grep $PWD/jails/$UPSTREAM-$ARCH/tmp /proc/mounts && return
+ umount $PWD/jails/$UPSTREAM-$ARCH/tmp && return
echo ERROR: could not umount tmpfs at jails/$UPSTREAM-$ARCH/tmp
exit 1
}
tmpmount(){
- mount|grep tmpfs|grep jails -q && return
[ $MEM -lt 16000000 ] && return
echo $PACKAGE | grep -q "linux" && return
grep jails/$UPSTREAM-$ARCH/tmp /proc/mounts -q && tmpumount
--
GitLab