Skip to content
Snippets Groups Projects
Commit 07676c0d authored by Ruben Rodriguez's avatar Ruben Rodriguez
Browse files

Merge branch 'master' into toutatis

parents 713cccc9 e953895a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 6 deletions
makepackage
+ 2
− 6
View file @ 07676c0d
...@@ -188,16 +188,12 @@ fi ...@@ -188,16 +188,12 @@ fi
} }
tmpumount(){ tmpumount(){
[ $MEM -lt 16000000 ] && return grep $PWD/jails/$UPSTREAM-$ARCH/tmp /proc/mounts && return
echo $PACKAGE | grep -q "linux" && return umount $PWD/jails/$UPSTREAM-$ARCH/tmp && return
umount jails/$UPSTREAM-$ARCH/tmp && return
fuser -k -m jails/$UPSTREAM-$ARCH/tmp
umount jails/$UPSTREAM-$ARCH/tmp && return
echo ERROR: could not umount tmpfs at jails/$UPSTREAM-$ARCH/tmp echo ERROR: could not umount tmpfs at jails/$UPSTREAM-$ARCH/tmp
exit 1 exit 1
} }
tmpmount(){ tmpmount(){
mount|grep tmpfs|grep jails -q && return
[ $MEM -lt 16000000 ] && return [ $MEM -lt 16000000 ] && return
echo $PACKAGE | grep -q "linux" && return echo $PACKAGE | grep -q "linux" && return
grep jails/$UPSTREAM-$ARCH/tmp /proc/mounts -q && tmpumount grep jails/$UPSTREAM-$ARCH/tmp /proc/mounts -q && tmpumount
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment