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

network: One more VLAN change for passthrough

Browse Source
This commit is contained in:
tschettervictor
2025-03-13 22:16:39 -06:00
committed by GitHub
parent 57b8760eb3
commit 1e188d09fe
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
usr/local/share/bastille/network.sh
View File

@@ -41,7 +41,7 @@ usage() {
-C | --classic Add an interface to a classic (non-VNET) jail. -C | --classic Add an interface to a classic (non-VNET) jail.
-M | --static-mac Generate a static MAC address for the interface. -M | --static-mac Generate a static MAC address for the interface.
-n | --no-ip Create interface without an IP (VNET only). -n | --no-ip Create interface without an IP (VNET only).
-P | --passthrough Pass the entire interface through to jail. -P | --passthrough Pass the entire interface througg to the jail.
-V | --vnet Add a VNET interface to an existing jail. -V | --vnet Add a VNET interface to an existing jail.
-v | --vlan VLANID Add interface with specified VLAN ID (VNET only). -v | --vlan VLANID Add interface with specified VLAN ID (VNET only).
-x | --debug Enable debug mode. -x | --debug Enable debug mode.
@@ -502,6 +502,8 @@ add_vlan() {
elif [ "${BRIDGE}" -eq 1 ]; then elif [ "${BRIDGE}" -eq 1 ]; then
local _jail_epair_num="$(grep ${_interface} ${_jail_config} | grep -Eo -m 1 "epair[0-9]+" | grep -Eo "[0-9]+")" local _jail_epair_num="$(grep ${_interface} ${_jail_config} | grep -Eo -m 1 "epair[0-9]+" | grep -Eo "[0-9]+")"
local _jail_vnet="$(grep "e.*${_jail_epair_num}b.*_name" ${_jail_rc_config} | grep -Eo "vnet[0-9]+")" local _jail_vnet="$(grep "e.*${_jail_epair_num}b.*_name" ${_jail_rc_config} | grep -Eo "vnet[0-9]+")"
elif [ "${PASSTHROUGH}" -eq 1 ]; then
local _jail_vnet="${_interface}"
fi fi
if grep -Eq "ifconfig_${_jail_vnet}_${_vlan_id}" "${bastille_jailsdir}/${_jailname}/root/etc/rc.conf"; then if grep -Eq "ifconfig_${_jail_vnet}_${_vlan_id}" "${bastille_jailsdir}/${_jailname}/root/etc/rc.conf"; then
error_exit "VLAN has already been added: VLAN ${_vlan_id}" error_exit "VLAN has already been added: VLAN ${_vlan_id}"