[PC-BSD Commits] r17450 - pcbsd/current/src-sh/warden/scripts/backend

[svn at pcbsd.org]

Author: kris
Date: 2012-06-26 14:43:13 +0000 (Tue, 26 Jun 2012)
New Revision: 17450

Modified:
   pcbsd/current/src-sh/warden/scripts/backend/startjail.sh
   pcbsd/current/src-sh/warden/scripts/backend/stopjail.sh
Log:

Improve start / stop



Modified: pcbsd/current/src-sh/warden/scripts/backend/startjail.sh
===================================================================
--- pcbsd/current/src-sh/warden/scripts/backend/startjail.sh	2012-06-26 14:16:43 UTC (rev 17449)
+++ pcbsd/current/src-sh/warden/scripts/backend/startjail.sh	2012-06-26 14:43:13 UTC (rev 17450)
@@ -37,6 +37,8 @@
   exit 6
 fi
 
+set_warden_metadir
+
 if [ -e "${JMETADIR}/linuxjail" ] ; then
    LINUXJAIL="YES"
 fi

Modified: pcbsd/current/src-sh/warden/scripts/backend/stopjail.sh
===================================================================
--- pcbsd/current/src-sh/warden/scripts/backend/stopjail.sh	2012-06-26 14:16:43 UTC (rev 17449)
+++ pcbsd/current/src-sh/warden/scripts/backend/stopjail.sh	2012-06-26 14:43:13 UTC (rev 17450)
@@ -91,11 +91,12 @@
   elif [ -e "${JDIR}/${IP}/etc/rc" ] ; then
     jexec ${JID} /bin/sh /etc/rc 0 2>&1
   fi
+  sleep 3
 
   umount -f ${JDIR}/${IP}/sys
   umount -f ${JDIR}/${IP}/dev/fd
-  umount -f ${JDIR}/${IP}/lib/init/rw >/dev/null 2>/dev/null
-
+  umount -f ${JDIR}/${IP}/dev
+  umount -f ${JDIR}/${IP}/lib/init/rw
 else
   jexec ${JID} /bin/sh /etc/rc.shutdown >/dev/null 2>/dev/null
 fi