Mirrors/BastilleBSD_bastille
1
0
Fork 1
mirror of https://github.com/BastilleBSD/bastille.git synced 2025-12-14 10:59:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "template: Add HOSTCMD to hooks"

Browse Source
This commit is contained in:
tschettervictor
2025-03-06 18:20:58 -07:00
committed by GitHub
parent ba79a545cc
commit a2e7f3e426
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/chapters/template.rst
View File

@@ -33,8 +33,6 @@ Template Automation Hooks
+-------------+---------------------+-----------------------------------------+ +-------------+---------------------+-----------------------------------------+
| CP/OVERLAY | path(s) | etc root usr (one per line) | | CP/OVERLAY | path(s) | etc root usr (one per line) |
+-------------+---------------------+-----------------------------------------+ +-------------+---------------------+-----------------------------------------+
| HOSTCMD | command | pkg info |
+-------------+---------------------+-----------------------------------------+
| INCLUDE | template path/URL | http?://TEMPLATE_URL or project/path | | INCLUDE | template path/URL | http?://TEMPLATE_URL or project/path |
+-------------+---------------------+-----------------------------------------+ +-------------+---------------------+-----------------------------------------+
| LIMITS | resource value | memoryuse 1G | | 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 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 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 LIMITS - set the specified resource value for the jail

7
usr/local/share/bastille/template.sh
View File

@@ -154,7 +154,7 @@ TARGET="${1}"
TEMPLATE="${2}" TEMPLATE="${2}"
bastille_template=${bastille_templatesdir}/${TEMPLATE} bastille_template=${bastille_templatesdir}/${TEMPLATE}
if [ -z "${HOOKS}" ]; then 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 fi
bastille_root_check bastille_root_check
@@ -369,11 +369,6 @@ for _jail in ${JAILS}; do
;; ;;
fstab|mount) fstab|mount)
_cmd='mount' ;; _cmd='mount' ;;
# Execute this command on the host
hostcmd)
eval "${_args}"
continue
;;
include) include)
_cmd='template' ;; _cmd='template' ;;
overlay) overlay)