From efa279bf7193170f061a7c3a1b5fe21e71950417 Mon Sep 17 00:00:00 2001 From: tschettervictor <85497460+tschettervictor@users.noreply.github.com> Date: Sat, 22 Feb 2025 23:45:24 -0700 Subject: [PATCH] template: Support old style IP/interface pair --- usr/local/share/bastille/template.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/usr/local/share/bastille/template.sh b/usr/local/share/bastille/template.sh index 10a6c255..10d8866f 100644 --- a/usr/local/share/bastille/template.sh +++ b/usr/local/share/bastille/template.sh @@ -239,13 +239,17 @@ for _jail in ${JAILS}; do if [ "${_jail_ip4}" = "not set" ] || [ "${_jail_ip4}" = "disabled" ]; then _jail_ip4='' # In case it was -. -- cwells elif echo "${_jail_ip4}" | grep -q "|"; then - _jail_ip4="$(echo ${_jail_ip4} 2>/dev/null | awk -F"|" '{print $2}' | sed -E 's#/[0-9]+$##g')" + _jail_ip4="$(echo ${_jail_ip4} | awk -F"|" '{print $2}' | sed -E 's#/[0-9]+$##g')" + else + _jail_ip4="$(echo ${_jail_ip4} | sed -E 's#/[0-9]+$##g')" fi ## remove value if ip6 was not set or disabled, otherwise get value if [ "${_jail_ip6}" = "not set" ] || [ "${_jail_ip6}" = "disabled" ]; then _jail_ip6='' # In case it was -. -- cwells if echo "${_jail_ip6}" | grep -q "|"; then - _jail_ip6="$(echo ${_jail_ip6} 2>/dev/null | awk -F"|" '{print $2}' | sed -E 's#/[0-9]+$##g')" + _jail_ip6="$(echo ${_jail_ip6} | awk -F"|" '{print $2}' | sed -E 's#/[0-9]+$##g')" + else + _jail_ip6="$(echo ${_jail_ip6} | sed -E 's#/[0-9]+$##g')" fi # print error when both ip4 and ip6 are not set if { [ "${_jail_ip4}" = "not set" ] || [ "${_jail_ip4}" = "disabled" ]; } && \