Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2025-12-21 17:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'BastilleBSD:master' into master

Browse Source
This commit is contained in:
tschettervictor
2024-12-16 07:24:28 -07:00
committed by GitHub
parent a42d1223c7 fb21ff1be3
commit 176e36d00e
24 changed files with 129 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
usr/local/share/bastille/common.sh
View File

@@ -47,7 +47,7 @@ enable_color() {
# If "NO_COLOR" environment variable is present, or we aren't speaking to a
# tty, disable output colors.
if [ -z "${NO_COLOR}" -a -t 1 ]; then
if [ -z "${NO_COLOR}" ] && [ -t 1 ]; then
enable_color
fi
@@ -86,9 +86,9 @@ generate_vnet_jail_netblock() {
## determine number of containers + 1
## iterate num and grep all jail configs
## define uniq_epair
local jail_list=$(bastille list jails)
local jail_list="$(bastille list jails)"
if [ -n "${jail_list}" ]; then
local list_jails_num=$(echo "${jail_list}" | wc -l | awk '{print $1}')
local list_jails_num="$(echo "${jail_list}" | wc -l | awk '{print $1}')"
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