[PC-BSD Commits] r17714 - pcbsd/current/src-sh/warden/scripts/rc.d

[svn at pcbsd.org]

Author: kris
Date: 2012-07-12 17:37:49 +0000 (Thu, 12 Jul 2012)
New Revision: 17714

Modified:
   pcbsd/current/src-sh/warden/scripts/rc.d/shutdown.sh
   pcbsd/current/src-sh/warden/scripts/rc.d/startup.sh
Log:

Fix how we run the startup / shutdown from rc.d



Modified: pcbsd/current/src-sh/warden/scripts/rc.d/shutdown.sh
===================================================================
--- pcbsd/current/src-sh/warden/scripts/rc.d/shutdown.sh	2012-07-12 13:19:38 UTC (rev 17713)
+++ pcbsd/current/src-sh/warden/scripts/rc.d/shutdown.sh	2012-07-12 17:37:49 UTC (rev 17714)
@@ -23,7 +23,7 @@
 if [ ! -d "${JDIR}" ] ; then exit 0 ; fi
 
 cd ${JDIR}
-for i in `ls -d .*.meta`
+for i in `ls -d .*.meta 2>/dev/null`
 do
   if [ ! -e "${i}/ip" ] ; then continue; fi
   jIP="`cat ${i}/ip`"
@@ -31,7 +31,7 @@
   ${PROGDIR}/scripts/backend/checkstatus.sh "${jIP}" 2>/dev/null
   if [ "$?" = "0" ] ; then
     echo "Stopping jail (${jIP})"
-    ${PROGDIR}/scripts/backend/stopjail.sh "${jIP}" "FAST"
+    warden stop "${jIP}" "FAST"
   fi
 done
 

Modified: pcbsd/current/src-sh/warden/scripts/rc.d/startup.sh
===================================================================
--- pcbsd/current/src-sh/warden/scripts/rc.d/startup.sh	2012-07-12 13:19:38 UTC (rev 17713)
+++ pcbsd/current/src-sh/warden/scripts/rc.d/startup.sh	2012-07-12 17:37:49 UTC (rev 17714)
@@ -23,12 +23,12 @@
 if [ ! -d "${JDIR}" ] ; then exit 0 ; fi
 
 cd ${JDIR}
-for i in `ls -d .*.meta`
+for i in `ls -d .*.meta 2>/dev/null`
 do
   if [ -e "${i}/ip" -a -e "${i}/autostart" ] ; then
    jIP=`cat ${i}/ip`"
    echo -e "Starting Jail (${jIP})...\c"
-   ${PROGDIR}/scripts/backend/startjail.sh "${jIP}" >/dev/null 2>/dev/null
+   warden start "${jIP}" >/dev/null 2>/dev/null
    echo "Done"
   fi
 done