From 24b49853718279b5141d63d0f0299ce5462e1c8a Mon Sep 17 00:00:00 2001 From: Tobias Tom Date: Mon, 27 Jul 2020 15:06:19 +0100 Subject: [PATCH 1/2] Renamed `cp` command to `overlay` to match the documentation. --- usr/local/share/bastille/template.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr/local/share/bastille/template.sh b/usr/local/share/bastille/template.sh index a7165232..c39ea8f0 100644 --- a/usr/local/share/bastille/template.sh +++ b/usr/local/share/bastille/template.sh @@ -132,7 +132,8 @@ for _jail in ${JAILS}; do # Allow redirection within the jail. -- cwells _args="sh -c '${_args}'" ;; - cp) + overlay) + _cmd='cp' # Convert relative "from" path into absolute path inside the template directory. -- cwells if [ "${_args%${_args#?}}" != '/' ]; then _args="${bastille_template}/${_args}" From 5a9034ff1821030193f4155d94011c58aab79f83 Mon Sep 17 00:00:00 2001 From: Tobias Tom Date: Mon, 27 Jul 2020 15:07:47 +0100 Subject: [PATCH 2/2] Added overlay command to be compatibile with the hooks. --- usr/local/share/bastille/template.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr/local/share/bastille/template.sh b/usr/local/share/bastille/template.sh index c39ea8f0..b4f8660f 100644 --- a/usr/local/share/bastille/template.sh +++ b/usr/local/share/bastille/template.sh @@ -134,6 +134,9 @@ for _jail in ${JAILS}; do ;; overlay) _cmd='cp' + _args="${bastille_template}/${_args} /" + ;; + cp|copy) # Convert relative "from" path into absolute path inside the template directory. -- cwells if [ "${_args%${_args#?}}" != '/' ]; then _args="${bastille_template}/${_args}"