Merge branch 'master' into toutatis

This commit is contained in:
Rubén Rodríguez 2012-11-15 20:03:01 +01:00
commit 0f46fef85d

View file

@ -188,8 +188,8 @@ fi
}
tmpumount(){
grep $PWD/jails/$UPSTREAM-$ARCH/tmp /proc/mounts && return
umount $PWD/jails/$UPSTREAM-$ARCH/tmp && return
grep jails/$UPSTREAM-$ARCH/tmp /proc/mounts -q || return
umount jails/$UPSTREAM-$ARCH/tmp && return
echo ERROR: could not umount tmpfs at jails/$UPSTREAM-$ARCH/tmp
exit 1
}