[PC-BSD Commits] r16287 - in pcbsd/current/src-qt4/warden: bin scripts/backend

[svn at pcbsd.org]

Author: kris
Date: 2012-04-09 15:15:22 +0000 (Mon, 09 Apr 2012)
New Revision: 16287

Removed:
   pcbsd/current/src-qt4/warden/scripts/backend/deleteinmate.sh
   pcbsd/current/src-qt4/warden/scripts/backend/installinmate.sh
   pcbsd/current/src-qt4/warden/scripts/backend/mkinmate.sh
Modified:
   pcbsd/current/src-qt4/warden/bin/warden
Log:

Remove inmate functionality for 9.1, instead meta-pkgs take their place



Modified: pcbsd/current/src-qt4/warden/bin/warden
===================================================================
--- pcbsd/current/src-qt4/warden/bin/warden	2012-04-09 14:11:06 UTC (rev 16286)
+++ pcbsd/current/src-qt4/warden/bin/warden	2012-04-09 15:15:22 UTC (rev 16287)
@@ -44,12 +44,9 @@
  details - Display usage details about a jail
   delete - Deletes a jail
   export - Exports a jail to a .wdn file
-  inload - Install an inmate package into a jail
-   indel - Deletes an inmate from a jail
   import - Imports a jail from a .wdn file
     list - Lists the installed jails
-mkinmate - Creates a inmate file from the specified directory
-    pkgs - Lists the installed packages / inmates in a jail
+    pkgs - Lists the installed packages in a jail
    start - Start a jail
     stop - Stops a jail
      set - Sets options for a jail
@@ -57,63 +54,6 @@
 "
 };
 
-help_mkinmate()
-{
- title
- echo "Help mkinmate
-
-Creates a warden inmate file (.wit) from a specified directory and 
-its contents. The finished .wit file will be created in your PWD. 
-
-NOTE: Please see the warden's documentation for information on the 
-inmate format and a creation guide. 
-
-Usage:
-
-  warden mkinmate <Inmate Directory>
-
-Example:
-
-  warden mkinmate /root/AMP-inmate
-"
-};
-
-help_inload()
-{
- title
- echo "Help inload
-
-Loads the specified inmate package into a specified jail. The command
-returns 0 on success. 
-
-Usage:
-
-  warden inload <IP> <Inmate File>
-
-Example:
-
-  warden inload 192.168.0.5 /root/AMP.wit
-"
-};
-
-help_indel()
-{
- title
- echo "Help indel
-
-Loads the specified inmate package into a specified jail. The command
-returns 0 on success.
-
-Usage:
-
-  warden indel <IP> <Inmate Package>
-
-Example:
-
-  warden indel 192.168.0.5 AMP1.0
-"
-};
-
 help_set()
 {
  title
@@ -387,9 +327,6 @@
            export) help_export ;;
            import) help_import ;;
            pkgs) help_pkgs ;;
-           inload) help_inload ;;
-           indel) help_indel ;;
-           mkinmate) help_mkinmate ;;
            type) help_type ;;
            set) help_set ;;
            *) help_main ;;
@@ -569,65 +506,7 @@
 
           ${PROGDIR}/scripts/backend/chrootjail.sh "${IP}" "${3}"
           ;;
- mkinmate) require_root
-         # The user wants to create an inmate package, do it
-         IDIR="${2}"
 
-         if [ -z "${IDIR}" ]
-         then
-           echo "ERROR: No inmate directory specified!"
-           exit 1
-         fi
-
-         # Pass the values off to the backend now
-         ${PROGDIR}/scripts/backend/mkinmate.sh "${IDIR}" ""
-        ;;
-
- inload) require_root
-         # The user wants to install an inmate package, do it 
-         IP="${2}"
-         IFILE="${3}"
-
-         if [ ! -e "$IFILE" ]
-         then
-           echo "ERROR: Invalid filename: ${IFILE}"
-           exit 1
-         fi
-
-         if [ -z "${IP}" ]
-         then
-           echo "ERROR: No IP specified!"
-           exit 1
-         fi
-
-         if [ ! -e "${JDIR}/${IP}" ]
-         then
-            echo "ERROR: No such jail!"
-            exit 1
-         fi
-
-         ${PROGDIR}/scripts/backend/installinmate.sh "${IP}" "${IFILE}"
-         ;;
- indel) require_root
-         # The user wants to remove an inmate package, do it
-         IP="${2}"
-         IPKG="${3}"
-
-         if [ -z "${IP}" ]
-         then
-           echo "ERROR: No IP specified!"
-           exit 1
-         fi
-
-         if [ ! -e "${JDIR}/${IP}" ]
-         then
-            echo "ERROR: No such jail!"
-            exit 1
-         fi
-
-         ${PROGDIR}/scripts/backend/deleteinmate.sh "${IP}" "${IPKG}"
-         ;;
-
  import) require_root
 	 # The user wants to import a jail, lets do it!
          IFILE="$2"