Merge pull request #507 from ellislm/fix_vnet_epair

fix non-unique epair creation when using vnet
2022-05-04 14:45:33 -06:00
parent e64c81d18a dbd4b5edc5
commit f14eddc958
1 changed files with 5 additions and 3 deletions
--- a/usr/local/share/bastille/common.sh
+++ b/usr/local/share/bastille/common.sh
@@ -74,9 +74,11 @@ generate_vnet_jail_netblock() {
        local num_range=$((list_jails_num + 1))
        for _num in $(seq 0 "${num_range}"); do
            if ! grep -q "e[0-9]b_bastille${_num}" "${bastille_jailsdir}"/*/jail.conf; then
-                local uniq_epair="bastille${_num}"
-                local uniq_epair_bridge="${_num}"
-                break
+                if ! grep -q "epair${_num}" "${bastille_jailsdir}"/*/jail.conf; then
+                    local uniq_epair="bastille${_num}"
+                    local uniq_epair_bridge="${_num}"
+                    break
+                fi
            fi
        done
    else