Merge branch 'BastilleBSD:master' into multiple-interfaces

docs/chapters/template.rst

@@ -33,8 +33,6 @@ Template Automation Hooks
 +-------------+---------------------+-----------------------------------------+
 | CP/OVERLAY  | path(s)             | etc root usr (one per line)             |
 +-------------+---------------------+-----------------------------------------+
-| HOSTCMD     | command             | pkg info                                |
-+-------------+---------------------+-----------------------------------------+
 | INCLUDE     | template path/URL   | http?://TEMPLATE_URL or project/path    |
 +-------------+---------------------+-----------------------------------------+
 | LIMITS      | resource value      | memoryuse 1G                            |
@@ -76,8 +74,6 @@ CONFIG      - set the specified property and value
 
 CP/OVERLAY  - copy specified files from template directory to specified path inside jail
 
-HOSTCMD     - run the specified command on the host instead of the jail
-
 INCLUDE     - specify a template to include. Make sure the template is bootstrapped, or you are using the template url
 
 LIMITS      - set the specified resource value for the jail

usr/local/share/bastille/template.sh

@@ -147,14 +147,14 @@ while [ "$#" -gt 0 ]; do
 done
 
 if [ $# -lt 2 ]; then
-    bastille_usage
+    usage
 fi
 
 TARGET="${1}"
 TEMPLATE="${2}"
 bastille_template=${bastille_templatesdir}/${TEMPLATE}
 if [ -z "${HOOKS}" ]; then
-    HOOKS='LIMITS INCLUDE PRE FSTAB PF PKG OVERLAY CONFIG SYSRC SERVICE CMD RENDER HOSTCMD'
+    HOOKS='LIMITS INCLUDE PRE FSTAB PF PKG OVERLAY CONFIG SYSRC SERVICE CMD RENDER'
 fi
 
 bastille_root_check
@@ -369,11 +369,6 @@ for _jail in ${JAILS}; do
                     ;;
                 fstab|mount)
                     _cmd='mount' ;;
-		# Execute this command on the host
-		hostcmd)
-                    eval "${_args}"
-		    continue
-                    ;;
                 include)
                     _cmd='template' ;;
                 overlay)