[PC-BSD Commits] r15649 - in pcbsd/current/src-qt4/warden: . bin conf scripts scripts/backend scripts/rc.d

svn at pcbsd.org svn at pcbsd.org
Wed Feb 29 08:39:00 PST 2012


Author: kris
Date: 2012-02-29 16:39:00 +0000 (Wed, 29 Feb 2012)
New Revision: 15649

Added:
   pcbsd/current/src-qt4/warden/scripts/backend/functions.sh
Modified:
   pcbsd/current/src-qt4/warden/bin/warden
   pcbsd/current/src-qt4/warden/conf/warden.conf
   pcbsd/current/src-qt4/warden/scripts/backend/checkstatus.sh
   pcbsd/current/src-qt4/warden/scripts/backend/chrootjail.sh
   pcbsd/current/src-qt4/warden/scripts/backend/createjail.sh
   pcbsd/current/src-qt4/warden/scripts/backend/deleteinmate.sh
   pcbsd/current/src-qt4/warden/scripts/backend/deletejail.sh
   pcbsd/current/src-qt4/warden/scripts/backend/exportjail.sh
   pcbsd/current/src-qt4/warden/scripts/backend/importjail.sh
   pcbsd/current/src-qt4/warden/scripts/backend/installinmate.sh
   pcbsd/current/src-qt4/warden/scripts/backend/listjails.sh
   pcbsd/current/src-qt4/warden/scripts/backend/listpkgs.sh
   pcbsd/current/src-qt4/warden/scripts/backend/mkinmate.sh
   pcbsd/current/src-qt4/warden/scripts/backend/setupusers.sh
   pcbsd/current/src-qt4/warden/scripts/backend/startjail.sh
   pcbsd/current/src-qt4/warden/scripts/backend/stopjail.sh
   pcbsd/current/src-qt4/warden/scripts/importjailmenu.sh
   pcbsd/current/src-qt4/warden/scripts/init-warden.sh
   pcbsd/current/src-qt4/warden/scripts/managejails.sh
   pcbsd/current/src-qt4/warden/scripts/newjailmenu.sh
   pcbsd/current/src-qt4/warden/scripts/rc.d/shutdown.sh
   pcbsd/current/src-qt4/warden/scripts/rc.d/startup.sh
   pcbsd/current/src-qt4/warden/scripts/warden.sh
   pcbsd/current/src-qt4/warden/warden.pro
Log:

Update the warden to use a new conf file, and functions.sh



Modified: pcbsd/current/src-qt4/warden/bin/warden
===================================================================
--- pcbsd/current/src-qt4/warden/bin/warden	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/bin/warden	2012-02-29 16:39:00 UTC (rev 15649)
@@ -12,18 +12,11 @@
    exit 155
 fi
 
-
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
 title()
 {

Modified: pcbsd/current/src-qt4/warden/conf/warden.conf
===================================================================
--- pcbsd/current/src-qt4/warden/conf/warden.conf	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/conf/warden.conf	2012-02-29 16:39:00 UTC (rev 15649)
@@ -1,105 +1,12 @@
 #!/bin/sh
-# Sourced functions for the warden
+# Configuration options for the Warden
 ######################################################################
-# These variables may be set with the "pbreg" command, or via the GUI tool
 
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
-
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
-# Location of the World src
-WORLDSRC="`pbreg get /PC-BSD/TheWarden/WorldSrc`"
-export WORLDSRC
-
-# Location of the built world environment
-WORLDDIR="`pbreg get /PC-BSD/TheWarden/WorldDir`"
-export WORLDDIR
-
 # Network Interface for the jails to use
-NIC="`pbreg get /PC-BSD/TheWarden/NIC`"
-export NIC
+NIC: re0
 
 # Directory to use for compressing / decompressing files 
-WTMP="`pbreg get /PC-BSD/TheWarden/TMPDIR`"
-export WTMP
+WTMP: /tmp
 
 # Location of the jails
-JDIR="`pbreg get /PC-BSD/TheWarden/JailDir`"
-export JDIR
-
-######################################################################
-# DO NOT EDIT BELOW THIS LINE
-
-# Temp file for dialog responses
-ATMP="/tmp/.wans"
-export ATMP
-
-# Warden Version
-WARDENVER="1.1.1"
-export WARDENVER
-
-# Function to ask the user to press Return to continue
-rtn()
-{
-  echo -e "Press ENTER to continue\c";
-  read garbage
-};
-
-# Function to check if an IP address passes a basic sanity test
-check_ip()
-{
-  ip="$1"
-  # Check if we can cut this IP into the right segments 
-  SEG="`echo $ip | cut -d '.' -f 1 2>/dev/null`"
-  echo $SEG | grep -E "^[0-9]+$" >/dev/null 2>/dev/null
-  if [ "$?" != "0" ]
-  then
-     return 1
-  fi
-  if [ $SEG -gt 255 -o $SEG -lt 0 ]
-  then
-     return 1
-  fi
-  
-  # Second segment
-  SEG="`echo $ip | cut -d '.' -f 2 2>/dev/null`"
-  echo $SEG | grep -E "^[0-9]+$" >/dev/null 2>/dev/null
-  if [ "$?" != "0" ]
-  then
-     return 1
-  fi
-  if [ $SEG -gt 255 -o $SEG -lt 0 ]
-  then
-     return 1
-  fi
-
-  # Third segment
-  SEG="`echo $ip | cut -d '.' -f 3 2>/dev/null`"
-  echo $SEG | grep -E "^[0-9]+$" >/dev/null 2>/dev/null
-  if [ "$?" != "0" ]
-  then
-     return 1
-  fi
-  if [ $SEG -gt 255 -o $SEG -lt 0 ]
-  then
-     return 1
-  fi
-  
-  # Fourth segment
-  SEG="`echo $ip | cut -d '.' -f 4 2>/dev/null`"
-  echo $SEG | grep -E "^[0-9]+$" >/dev/null 2>/dev/null
-  if [ "$?" != "0" ]
-  then
-     return 1
-  fi
-  if [ $SEG -gt 255 -o $SEG -lt 0 ]
-  then
-     return 1
-  fi
-
-  return 0
-};
+JDIR: /usr/jails

Modified: pcbsd/current/src-qt4/warden/scripts/backend/checkstatus.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/checkstatus.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/checkstatus.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -4,18 +4,11 @@
 ######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
-
 IP="$1"
 
 if [ -z "$IP" ]

Modified: pcbsd/current/src-qt4/warden/scripts/backend/chrootjail.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/chrootjail.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/chrootjail.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -4,16 +4,10 @@
 ######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
 IP="$1"
 

Modified: pcbsd/current/src-qt4/warden/scripts/backend/createjail.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/createjail.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/createjail.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -3,18 +3,11 @@
 #####################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
-
 # Load our passed values
 IP="${1}"
 HOST="${2}"
@@ -37,11 +30,14 @@
   exit 5
 fi
 
+# Check if we need to download the chroot file
+if [ ! -e "${WORLDCHROOT}" ] ; then downloadchroot ; fi
+
 echo "Building new Jail... Please wait..."
 mkdir -p "${JAILDIR}"
 
 echo "Installing world..."
-tar cvf - -C ${WORLDDIR} . 2>/dev/null | tar xvf - -C "${JAILDIR}" 2>/dev/null
+tar xvf ${WORLDCHROOT} -C "${JAILDIR}" 2>/dev/null
 echo "Done"
 
 echo "${HOST}" > ${JAILDIR}/etc/.wardenhost
@@ -51,7 +47,7 @@
 then
   echo "Installing source..."
   mkdir -p "${JAILDIR}/usr/src"
-  tar cvf - -C ${WORLDSRC} . 2>/dev/null | tar xvf - -C "${JAILDIR}/usr/src" 2>/dev/null
+  tar cvf - -C /usr/src . 2>/dev/null | tar xvf - -C "${JAILDIR}/usr/src" 2>/dev/null
   echo "Done"
 fi
 
@@ -59,7 +55,7 @@
 then
   echo "Installing ports..."
   mkdir -p "${JAILDIR}/usr/ports"
-  tar cvf - -C ${PROGDIR}/ports . 2>/dev/null | tar xvf - -C "${JAILDIR}/usr/ports" 2>/dev/null
+  tar cvf - -C /usr/ports . 2>/dev/null | tar xvf - -C "${JAILDIR}/usr/ports" 2>/dev/null
   echo "Done"
 fi
 

Modified: pcbsd/current/src-qt4/warden/scripts/backend/deleteinmate.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/deleteinmate.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/deleteinmate.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -3,16 +3,10 @@
 ######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+. ${PROGDIR}/scripts/backend/functions.sh
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
 IP="$1"
 IPKG="$2"

Modified: pcbsd/current/src-qt4/warden/scripts/backend/deletejail.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/deletejail.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/deletejail.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -4,18 +4,11 @@
 #######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
-
 IP="$1"
 
 if [ -z "${IP}" ]

Modified: pcbsd/current/src-qt4/warden/scripts/backend/exportjail.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/exportjail.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/exportjail.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -3,16 +3,10 @@
 ######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
 IP="$1"
 OUTDIR="$2"

Index: pcbsd/current/src-qt4/warden/scripts/backend/functions.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/functions.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/functions.sh	2012-02-29 16:39:00 UTC (rev 15649)

Property changes on: pcbsd/current/src-qt4/warden/scripts/backend/functions.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
Modified: pcbsd/current/src-qt4/warden/scripts/backend/importjail.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/importjail.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/importjail.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -3,22 +3,15 @@
 ######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
 IFILE="$1"
 IP="${2}"
 HOST="${3}"
 
-
 if [ -z "${IFILE}" -o ! -e "${IFILE}" ]
 then
   echo "ERROR: No jail specified or invalid file!"

Modified: pcbsd/current/src-qt4/warden/scripts/backend/installinmate.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/installinmate.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/installinmate.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -3,16 +3,10 @@
 ######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
 IP="$1"
 IFILE="$2"

Modified: pcbsd/current/src-qt4/warden/scripts/backend/listjails.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/listjails.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/listjails.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -3,16 +3,10 @@
 ######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
 # Check if we have any jails
 if [ ! -d "${JDIR}" ]

Modified: pcbsd/current/src-qt4/warden/scripts/backend/listpkgs.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/listpkgs.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/listpkgs.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -3,16 +3,10 @@
 ######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
 IP="$1"
 

Modified: pcbsd/current/src-qt4/warden/scripts/backend/mkinmate.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/mkinmate.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/mkinmate.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -3,16 +3,10 @@
 ######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
 IDIR="$1"
 IFILEDIR="$2"

Modified: pcbsd/current/src-qt4/warden/scripts/backend/setupusers.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/setupusers.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/setupusers.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -7,18 +7,11 @@
 ######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
-
 IP="$1"
 ROOTPW="${2}"
 USERNAME="${3}"

Modified: pcbsd/current/src-qt4/warden/scripts/backend/startjail.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/startjail.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/startjail.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -4,21 +4,13 @@
 #######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
-
 IP="${1}"
 
-
 if [ -z "${IP}" ]
 then
   echo "ERROR: No jail specified to start!"

Modified: pcbsd/current/src-qt4/warden/scripts/backend/stopjail.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/stopjail.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/backend/stopjail.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -4,16 +4,10 @@
 #######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
 IP="${1}"
 if [ "${2}" = "FAST" ]

Modified: pcbsd/current/src-qt4/warden/scripts/importjailmenu.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/importjailmenu.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/importjailmenu.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -3,16 +3,10 @@
 ######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
 if [ -z "${JDIR}" ]
 then

Modified: pcbsd/current/src-qt4/warden/scripts/init-warden.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/init-warden.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/init-warden.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -2,31 +2,3 @@
 # Script which sets some inits some of the pbreg values that warden will be needing
 
 PROGDIR="/usr/local/share/warden"
-WORLDDIR="${PROGDIR}/worlds/defaultworld"
-JAILDIR="${PROGDIR}/jails"
-
-# Set our default config values
-pbreg set /PC-BSD/TheWarden/ProgDir "${PROGDIR}"
-pbreg set /PC-BSD/TheWarden/WorldSrc "/usr/src"
-pbreg set /PC-BSD/TheWarden/WorldDir "${WORLDDIR}"
-pbreg set /PC-BSD/TheWarden/TMPDIR "${PROGDIR}/tmp"
-pbreg set /PC-BSD/TheWarden/JailDir "${JAILDIR}"
-
-# Ask the user which nic to use
-echo "Which network interface do you want to run jails on?"
-echo -e "nic: \c"
-readnic 
-
-echo "Using $nic for jails"
-pbreg set /PC-BSD/TheWarden/NIC "$nic"
-
-echo "This can be changed by running the following command at a later date:"
-echo "pbreg set /PC-BSD/TheWarden/NIC <nic>"
-
-# Warn the user about defaultworld
-echo "Reminder: You will need to create a default world environment for creating new jails!"
-echo "To do so, use the following commands in your /usr/src (or alternate source dir)"
-
-echo "# cd /usr/src"
-echo "# mkdir $WORLDDIR"
-echo "# make buildworld installworld DESTDIR=${WORLDDIR}"

Modified: pcbsd/current/src-qt4/warden/scripts/managejails.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/managejails.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/managejails.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -3,19 +3,11 @@
 #######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
-
-
 ls -d ${JDIR}/* >/dev/null 2>/dev/null
 if [ "$?" != "0" ]
 then

Modified: pcbsd/current/src-qt4/warden/scripts/newjailmenu.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/newjailmenu.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/newjailmenu.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -3,18 +3,11 @@
 #####################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
-
 cd ${PROGDIR}
 
 # Prompt for an IP for this jail

Modified: pcbsd/current/src-qt4/warden/scripts/rc.d/shutdown.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/rc.d/shutdown.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/rc.d/shutdown.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -15,7 +15,7 @@
 fi
 
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
 echo "Stopping the Warden"
 

Modified: pcbsd/current/src-qt4/warden/scripts/rc.d/startup.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/rc.d/startup.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/rc.d/startup.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -15,7 +15,7 @@
 fi
 
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
 echo "Starting the Warden"
 

Modified: pcbsd/current/src-qt4/warden/scripts/warden.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/warden.sh	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/scripts/warden.sh	2012-02-29 16:39:00 UTC (rev 15649)
@@ -3,16 +3,10 @@
 ######################################################################
 
 # Source our functions
-PROGDIR="`pbreg get /PC-BSD/TheWarden/ProgDir`"
+PROGDIR="/usr/local/share/warden"
 
-if [ -z "${PROGDIR}" ]
-then
-   echo "PROGDIR unset! Is The Warden installed properly?"
-   exit 155
-fi
-
 # Source our variables
-. ${PROGDIR}/conf/warden.conf
+. ${PROGDIR}/scripts/backend/functions.sh
 
 # Start our main menu loop
 while

Modified: pcbsd/current/src-qt4/warden/warden.pro
===================================================================
--- pcbsd/current/src-qt4/warden/warden.pro	2012-02-29 16:26:11 UTC (rev 15648)
+++ pcbsd/current/src-qt4/warden/warden.pro	2012-02-29 16:39:00 UTC (rev 15649)
@@ -10,7 +10,7 @@
 binscript.path=$${INSTALLDIR}/bin
 binscript.files=bin/*
 
-conf.path=$${INSTALLDIR}/conf
+conf.path=/usr/local/etc
 conf.files=conf/*
 
 binlink.path=/usr/local/bin



More information about the Commits mailing list