[PC-BSD Commits] r7374 - in pcbsd-projects/warden: bin conf scripts scripts/backend scripts/rc.d
svn at pcbsd.org
svn at pcbsd.org
Wed Aug 11 06:34:31 PDT 2010
Author: kris
Date: 2010-08-11 06:34:30 -0700 (Wed, 11 Aug 2010)
New Revision: 7374
Modified:
pcbsd-projects/warden/bin/warden
pcbsd-projects/warden/conf/warden.conf
pcbsd-projects/warden/scripts/backend/checkstatus.sh
pcbsd-projects/warden/scripts/backend/chrootjail.sh
pcbsd-projects/warden/scripts/backend/createjail.sh
pcbsd-projects/warden/scripts/backend/deleteinmate.sh
pcbsd-projects/warden/scripts/backend/deletejail.sh
pcbsd-projects/warden/scripts/backend/exportjail.sh
pcbsd-projects/warden/scripts/backend/importjail.sh
pcbsd-projects/warden/scripts/backend/installinmate.sh
pcbsd-projects/warden/scripts/backend/listjails.sh
pcbsd-projects/warden/scripts/backend/listpkgs.sh
pcbsd-projects/warden/scripts/backend/mkinmate.sh
pcbsd-projects/warden/scripts/backend/setupusers.sh
pcbsd-projects/warden/scripts/backend/startjail.sh
pcbsd-projects/warden/scripts/backend/stopjail.sh
pcbsd-projects/warden/scripts/importjailmenu.sh
pcbsd-projects/warden/scripts/managejails.sh
pcbsd-projects/warden/scripts/rc.d/shutdown.sh
pcbsd-projects/warden/scripts/rc.d/startup.sh
pcbsd-projects/warden/scripts/rc.d/wardenrc
pcbsd-projects/warden/scripts/warden.sh
Log:
Fixes to warden, get rid of any bash references, and fix problem starting jails at bootup because of unset PATH
Modified: pcbsd-projects/warden/bin/warden
===================================================================
--- pcbsd-projects/warden/bin/warden 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/bin/warden 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Command-line interaction script for the warden
# Author: Kris Moore
# License: BSD
Modified: pcbsd-projects/warden/conf/warden.conf
===================================================================
--- pcbsd-projects/warden/conf/warden.conf 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/conf/warden.conf 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Sourced functions for the warden
######################################################################
# These variables may be set with the "pbreg" command, or via the GUI tool
Modified: pcbsd-projects/warden/scripts/backend/checkstatus.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/checkstatus.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/backend/checkstatus.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Script to check a jail status
# Args $1 = IP
######################################################################
Modified: pcbsd-projects/warden/scripts/backend/chrootjail.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/chrootjail.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/backend/chrootjail.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Chroot into a working jail
# IP = $1
######################################################################
Modified: pcbsd-projects/warden/scripts/backend/createjail.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/createjail.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/backend/createjail.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Script to create a new jail based on given flags
#####################################################################
Modified: pcbsd-projects/warden/scripts/backend/deleteinmate.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/deleteinmate.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/backend/deleteinmate.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Deltes an inmate from a jail
######################################################################
Modified: pcbsd-projects/warden/scripts/backend/deletejail.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/deletejail.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/backend/deletejail.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Script to stop a jail
# Args $1 = jail-dir
#######################################################################
Modified: pcbsd-projects/warden/scripts/backend/exportjail.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/exportjail.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/backend/exportjail.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Export a jail into a self-contained file for transport / backup
######################################################################
Modified: pcbsd-projects/warden/scripts/backend/importjail.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/importjail.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/backend/importjail.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Install a package set into a jail
######################################################################
Modified: pcbsd-projects/warden/scripts/backend/installinmate.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/installinmate.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/backend/installinmate.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Install a package set into a jail
######################################################################
Modified: pcbsd-projects/warden/scripts/backend/listjails.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/listjails.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/backend/listjails.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Prints a listing of the installed jails
######################################################################
Modified: pcbsd-projects/warden/scripts/backend/listpkgs.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/listpkgs.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/backend/listpkgs.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Install a package set into a jail
######################################################################
Modified: pcbsd-projects/warden/scripts/backend/mkinmate.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/mkinmate.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/backend/mkinmate.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Make an inmate file from a configured directory
######################################################################
Modified: pcbsd-projects/warden/scripts/backend/setupusers.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/setupusers.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/backend/setupusers.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Script to setup the initial usernames / passwords on a jail
# Args $1 = IP
# Args $2 = rootPW
Modified: pcbsd-projects/warden/scripts/backend/startjail.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/startjail.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/backend/startjail.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Script to startup a jail
# Args $1 = jail-dir
#######################################################################
Modified: pcbsd-projects/warden/scripts/backend/stopjail.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/stopjail.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/backend/stopjail.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Script to stop a jail
# Args $1 = jail-dir
#######################################################################
Modified: pcbsd-projects/warden/scripts/importjailmenu.sh
===================================================================
--- pcbsd-projects/warden/scripts/importjailmenu.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/importjailmenu.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Install a package set into a jail
######################################################################
Modified: pcbsd-projects/warden/scripts/managejails.sh
===================================================================
--- pcbsd-projects/warden/scripts/managejails.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/managejails.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Script for user navigation of jails
#######################################################################
Modified: pcbsd-projects/warden/scripts/rc.d/shutdown.sh
===================================================================
--- pcbsd-projects/warden/scripts/rc.d/shutdown.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/rc.d/shutdown.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,7 +1,10 @@
-#!/bin/bash
+#!/bin/sh
# Starts up the warden service
######################################################################
+PATH="${PATH}:/usr/local/bin:/usr/local/sbin"
+export PATH
+
# Source our functions
PROGDIR="${1}"
Modified: pcbsd-projects/warden/scripts/rc.d/startup.sh
===================================================================
--- pcbsd-projects/warden/scripts/rc.d/startup.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/rc.d/startup.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,7 +1,10 @@
-#!/bin/bash
+#!/bin/sh
# Starts up the warden service
######################################################################
+PATH="${PATH}:/usr/local/bin:/usr/local/sbin"
+export PATH
+
# Source our functions
PROGDIR="${1}"
@@ -26,4 +29,3 @@
echo "Done"
fi
done
-
Modified: pcbsd-projects/warden/scripts/rc.d/wardenrc
===================================================================
--- pcbsd-projects/warden/scripts/rc.d/wardenrc 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/rc.d/wardenrc 2010-08-11 13:34:30 UTC (rev 7374)
@@ -18,13 +18,13 @@
warden_start()
{
- PROGDIR="`/usr/local/bin/pbreg get /PC-BSD/TheWarden/ProgDir`"
+ PROGDIR="/usr/local/warden"
$PROGDIR/scripts/rc.d/startup.sh "${PROGDIR}"
}
warden_stop()
{
- PROGDIR="`/usr/local/bin/pbreg get /PC-BSD/TheWarden/ProgDir`"
+ PROGDIR="/usr/local/warden"
$PROGDIR/scripts/rc.d/shutdown.sh "${PROGDIR}"
}
Modified: pcbsd-projects/warden/scripts/warden.sh
===================================================================
--- pcbsd-projects/warden/scripts/warden.sh 2010-08-10 20:44:25 UTC (rev 7373)
+++ pcbsd-projects/warden/scripts/warden.sh 2010-08-11 13:34:30 UTC (rev 7374)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Main Menu script for The Warden
######################################################################
More information about the Commits
mailing list