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

[svn at pcbsd.org]

Author: kris
Date: 2012-10-19 07:54:13 +0000 (Fri, 19 Oct 2012)
New Revision: 19772

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

Make chroot able to live in jail dir other than /usr/jails



Modified: pcbsd/current/src-sh/warden/scripts/backend/functions.sh
===================================================================
--- pcbsd/current/src-sh/warden/scripts/backend/functions.sh	2012-10-19 01:55:03 UTC (rev 19771)
+++ pcbsd/current/src-sh/warden/scripts/backend/functions.sh	2012-10-19 07:54:13 UTC (rev 19772)
@@ -9,8 +9,12 @@
 # Installation directory
 PROGDIR="/usr/local/share/warden"
 
+# Jail location
+JDIR="$(grep ^JDIR: /usr/local/etc/warden.conf | cut -d' ' -f2)"
+export JDIR
+
 # Location of the chroot environment
-WORLDCHROOT="/usr/jails/.warden-chroot.txz"
+WORLDCHROOT="${JDIR}/.warden-chroot.txz"
 export WORLDCHROOT
 
 # Location of pcbsd.conf file
@@ -24,10 +28,6 @@
 WTMP="$(grep ^WTMP: /usr/local/etc/warden.conf | cut -d' ' -f2)"
 export WTMP
 
-# Jail location
-JDIR="$(grep ^JDIR: /usr/local/etc/warden.conf | cut -d' ' -f2)"
-export JDIR
-
 # Temp file for dialog responses
 ATMP="/tmp/.wans"
 export ATMP