Merge branch 'master' into toutatis

This commit is contained in:
Rubén Rodríguez 2013-01-17 00:04:39 +01:00
commit f709561de5

View file

@ -188,7 +188,7 @@ fi
} }
tmpumount(){ tmpumount(){
grep jails/$UPSTREAM-$ARCH/tmp /proc/mounts -q || return grep jails/$UPSTREAM-$ARCH/tmp /proc/mounts -q || return 0
umount jails/$UPSTREAM-$ARCH/tmp && return 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