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

Merge pull request #1229 from JRGTH/common_script_bugfix

Browse Source
This commit is contained in:
tschettervictor
2025-09-10 21:41:02 -04:00
committed by GitHub
parent 725c9f2ab8 2ef6a6ebb0
commit b67c1a08d9
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,11 +201,11 @@ set_target() {
if jail_autocomplete "${_jail}" > /dev/null; then if jail_autocomplete "${_jail}" > /dev/null; then
_jail="$(jail_autocomplete ${_jail})" _jail="$(jail_autocomplete ${_jail})"
elif [ $? -eq 2 ]; then elif [ $? -eq 2 ]; then
if grep -Ehoqw ${_jail} ${bastille_jailsdir}/*/tags; then if grep -Ehoqw ${_jail} ${bastille_jailsdir}/*/tags 2>/dev/null; then
_jail="$(grep -Eow ${_jail} ${bastille_jailsdir}/*/tags | awk -F"/tags" '{print $1}' | sed "s#${bastille_jailsdir}/##g" | tr '\n' ' ')" _jail="$(grep -Eow ${_jail} ${bastille_jailsdir}/*/tags | awk -F"/tags" '{print $1}' | sed "s#${bastille_jailsdir}/##g" | tr '\n' ' ')"
else else
error_continue "Jail not found \"${_jail}\"" error_continue "Jail not found \"${_jail}\""
fi fi
else else
echo echo
exit 1 exit 1
@@ -359,32 +359,32 @@ generate_vnet_jail_netblock() {
local host_epair=e0a_${jail_name} local host_epair=e0a_${jail_name}
local jail_epair=e0b_${jail_name} local jail_epair=e0b_${jail_name}
else else
name_prefix="$(echo ${jail_name} | cut -c1-7)" name_prefix="$(echo ${jail_name} | cut -c1-7)"
name_suffix="$(echo ${jail_name} | rev | cut -c1-2 | rev)" name_suffix="$(echo ${jail_name} | rev | cut -c1-2 | rev)"
local host_epair="e0a_${name_prefix}xx${name_suffix}" local host_epair="e0a_${name_prefix}xx${name_suffix}"
local jail_epair="e0b_${name_prefix}xx${name_suffix}" local jail_epair="e0b_${name_prefix}xx${name_suffix}"
fi fi
else else
if [ "$(echo -n "e0a_${jail_name}" | awk '{print length}')" -lt 16 ]; then if [ "$(echo -n "e0a_${jail_name}" | awk '{print length}')" -lt 16 ]; then
local host_epair=e0a_${jail_name} local host_epair=e0a_${jail_name}
local jail_epair=e0b_${jail_name} local jail_epair=e0b_${jail_name}
local jib_epair=${jail_name} local jib_epair=${jail_name}
else else
name_prefix="$(echo ${jail_name} | cut -c1-7)" name_prefix="$(echo ${jail_name} | cut -c1-7)"
name_suffix="$(echo ${jail_name} | rev | cut -c1-2 | rev)" name_suffix="$(echo ${jail_name} | rev | cut -c1-2 | rev)"
local host_epair="e0a_${name_prefix}xx${name_suffix}" local host_epair="e0a_${name_prefix}xx${name_suffix}"
local jail_epair="e0b_${name_prefix}xx${name_suffix}" local jail_epair="e0b_${name_prefix}xx${name_suffix}"
local jib_epair="${name_prefix}xx${name_suffix}" local jib_epair="${name_prefix}xx${name_suffix}"
fi fi
fi fi
elif [ "${bastille_network_vnet_type}" = "netgraph" ]; then elif [ "${bastille_network_vnet_type}" = "netgraph" ]; then
if [ "$(echo -n "ng0_${jail_name}" | awk '{print length}')" -lt 16 ]; then if [ "$(echo -n "ng0_${jail_name}" | awk '{print length}')" -lt 16 ]; then
local ng_if=ng0_${jail_name} local ng_if=ng0_${jail_name}
local jng_if=${jail_name} local jng_if=${jail_name}
else else
name_prefix="$(echo ${jail_name} | cut -c1-7)" name_prefix="$(echo ${jail_name} | cut -c1-7)"
name_suffix="$(echo ${jail_name} | rev | cut -c1-2 | rev)" name_suffix="$(echo ${jail_name} | rev | cut -c1-2 | rev)"
local ng_if="ng0_${name_prefix}xx${name_suffix}" local ng_if="ng0_${name_prefix}xx${name_suffix}"
local jng_if="${name_prefix}xx${name_suffix}" local jng_if="${name_prefix}xx${name_suffix}"
fi fi
fi fi
@@ -521,9 +521,9 @@ update_jail_syntax_v1() {
local new_host_epair=e0a_${jail} local new_host_epair=e0a_${jail}
local new_jail_epair=e0b_${jail} local new_jail_epair=e0b_${jail}
else else
name_prefix="$(echo ${jail} | cut -c1-7)" name_prefix="$(echo ${jail} | cut -c1-7)"
name_suffix="$(echo ${jail} | rev | cut -c1-2 | rev)" name_suffix="$(echo ${jail} | rev | cut -c1-2 | rev)"
local new_host_epair="e0a_${name_prefix}xx${name_suffix}" local new_host_epair="e0a_${name_prefix}xx${name_suffix}"
local new_jail_epair="e0b_${name_prefix}xx${name_suffix}" local new_jail_epair="e0b_${name_prefix}xx${name_suffix}"
fi fi
@@ -557,9 +557,9 @@ update_jail_syntax_v1() {
local new_jail_epair=e0b_${jail} local new_jail_epair=e0b_${jail}
local jib_epair="${jail}" local jib_epair="${jail}"
else else
name_prefix="$(echo ${jail} | cut -c1-7)" name_prefix="$(echo ${jail} | cut -c1-7)"
name_suffix="$(echo ${jail} | rev | cut -c1-2 | rev)" name_suffix="$(echo ${jail} | rev | cut -c1-2 | rev)"
local new_host_epair="e0a_${name_prefix}xx${name_suffix}" local new_host_epair="e0a_${name_prefix}xx${name_suffix}"
local new_jail_epair="e0b_${name_prefix}xx${name_suffix}" local new_jail_epair="e0b_${name_prefix}xx${name_suffix}"
local jib_epair="${name_prefix}xx${name_suffix}" local jib_epair="${name_prefix}xx${name_suffix}"
fi fi