BastilleBSD/bastille
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Improve interface validation on vnet jail creation

Browse Source
This commit is contained in:
Jose
2021-01-12 23:15:39 -04:00
parent 87944a0fd0
commit 2474382756
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
usr/local/share/bastille/create.sh
View File

@@ -176,7 +176,7 @@ ${NAME} {
vnet; vnet;
vnet.interface = e0b_${uniq_epair}; vnet.interface = e0b_${uniq_epair};
exec.prestart += "jib addm ${uniq_epair} ${INTERFACE}"; exec.prestart += "jib addm ${uniq_epair} ${bastille_jail_conf_interface}";
exec.poststop += "jib destroy ${uniq_epair}"; exec.poststop += "jib destroy ${uniq_epair}";
} }
EOF EOF
@@ -543,10 +543,14 @@ if [ -z "${EMPTY_JAIL}" ]; then
if [ -n "${INTERFACE}" ]; then if [ -n "${INTERFACE}" ]; then
validate_netif validate_netif
validate_netconf validate_netconf
elif [ -z "${INTERFACE}" ]; then elif [ -n "${VNET_JAIL}" ]; then
if [ -n "${VNET_JAIL}" ]; then if [ -z "${INTERFACE}" ]; then
# User must specify interface on vnet jails. if [ -z "${bastille_network_shared}" ]; then
error_exit "Error: Network interface not defined." # User must specify interface on vnet jails.
error_exit "Error: Network interface not defined."
else
validate_netconf
fi
fi fi
else else
validate_netconf validate_netconf