[PC-BSD Commits] r17747 - in pcbsd/current/src-sh/warden: linux-installs scripts/backend

svn at pcbsd.org svn at pcbsd.org
Mon Jul 16 06:41:47 PDT 2012


Author: kris
Date: 2012-07-16 13:41:47 +0000 (Mon, 16 Jul 2012)
New Revision: 17747

Modified:
   pcbsd/current/src-sh/warden/linux-installs/gentoo-stage3-i486
   pcbsd/current/src-sh/warden/scripts/backend/startjail.sh
   pcbsd/current/src-sh/warden/scripts/backend/stopjail.sh
Log:

Fix a few small things with starting / stopping jails, and get rid of
extra flags for gentoo



Modified: pcbsd/current/src-sh/warden/linux-installs/gentoo-stage3-i486
===================================================================
--- pcbsd/current/src-sh/warden/linux-installs/gentoo-stage3-i486	2012-07-16 13:41:11 UTC (rev 17746)
+++ pcbsd/current/src-sh/warden/linux-installs/gentoo-stage3-i486	2012-07-16 13:41:47 UTC (rev 17747)
@@ -114,6 +114,5 @@
 # Setup some custom start / stop stuff
 echo "/sbin/rc default" > ${3}/jail-start
 echo "/sbin/rc shutdown" > ${3}/jail-stop
-echo "-l -u root" > ${3}/jail-flags
 
 exit $err

Modified: pcbsd/current/src-sh/warden/scripts/backend/startjail.sh
===================================================================
--- pcbsd/current/src-sh/warden/scripts/backend/startjail.sh	2012-07-16 13:41:11 UTC (rev 17746)
+++ pcbsd/current/src-sh/warden/scripts/backend/startjail.sh	2012-07-16 13:41:47 UTC (rev 17747)
@@ -122,6 +122,7 @@
   # If we have a custom startup script
   if [ -e "${JMETADIR}/jail-startup" ] ; then
     sCmd=`cat ${JMETADIR}/jail-startup`
+    echo "Starting jail with: ${sCmd}"
     jexec ${JID} ${sCmd} 2>&1
   else
     # Check for different init styles
@@ -135,8 +136,10 @@
   # If we have a custom startup script
   if [ -e "${JMETADIR}/jail-startup" ] ; then
     sCmd=`cat ${JMETADIR}/jail-startup`
+    echo "Starting jail with: ${sCmd}"
     jexec ${JID} ${sCmd} 2>&1
   else
+    echo "Starting jail with: /etc/rc"
     jexec ${JID} /bin/sh /etc/rc 2>&1
   fi
 fi

Modified: pcbsd/current/src-sh/warden/scripts/backend/stopjail.sh
===================================================================
--- pcbsd/current/src-sh/warden/scripts/backend/stopjail.sh	2012-07-16 13:41:11 UTC (rev 17746)
+++ pcbsd/current/src-sh/warden/scripts/backend/stopjail.sh	2012-07-16 13:41:47 UTC (rev 17747)
@@ -88,6 +88,7 @@
   # If we have a custom stop script
   if [ -e "${JMETADIR}/jail-stop" ] ; then
     sCmd=`cat ${JMETADIR}/jail-stop`
+    echo "Stopping jail with: ${sCmd}"
     jexec ${JID} ${sCmd} 2>&1
   else
     # Check for different init styles
@@ -107,8 +108,10 @@
   # If we have a custom stop script
   if [ -e "${JMETADIR}/jail-stop" ] ; then
     sCmd=`cat ${JMETADIR}/jail-stop`
+    echo "Stopping jail with: ${sCmd}"
     jexec ${JID} ${sCmd} 2>&1
   else
+    echo "Stopping jail with: /etc/rc.shutdown"
     jexec ${JID} /bin/sh /etc/rc.shutdown >/dev/null 2>/dev/null
   fi
 fi



More information about the Commits mailing list