From 745f312681e740e6f961845b810057113bf82de7 Mon Sep 17 00:00:00 2001 From: tschettervictor <85497460+tschettervictor@users.noreply.github.com> Date: Wed, 16 Apr 2025 17:48:39 -0600 Subject: [PATCH] fix epair listing again --- usr/local/share/bastille/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/share/bastille/common.sh b/usr/local/share/bastille/common.sh index 681b0ac7..58500a92 100644 --- a/usr/local/share/bastille/common.sh +++ b/usr/local/share/bastille/common.sh @@ -121,7 +121,7 @@ check_target_is_stopped() { get_epair_count() { for _config in /usr/local/etc/bastille/*.conf; do local bastille_jailsdir="$(sysrc -f "${_config}" -n bastille_jailsdir)" - _epair_list="$(printf '%s\n' "$( (grep -Eos '(e[0-9]+b|bastille[0-9]+)' ${bastille_jailsdir}/*/jail.conf; ifconfig -g epair) | grep -Eo "[0-9]+")" "${_epair_list}" | sort -u)" + _epair_list="$(printf '%s\n' "$( (grep -Eo '(epair[0-9]+|bastille[0-9]+)' ${bastille_jailsdir}/*/jail.conf; ifconfig -g epair | grep -Eo "_bastille[0-9]+$"; ifconfig -g epair | grep -v "bastille" | grep -Eo "e[0-9]+a_") | grep -Eo "[0-9]+")" "${_epair_list}" | sort -u)" done _epair_count=$(printf '%s' "${_epair_list}" | wc -l | awk '{print $1}') export _epair_list