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

Merge pull request #561 from Vertalo/ip-in-use

Browse Source 
Fix bug in ip-in-use test
This commit is contained in:
Christer Edwards
2022-12-13 20:54:58 -07:00
committed by GitHub
parent bfce059225 ec18847f3e
commit c00d8a4e05
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
usr/local/share/bastille/clone.sh
View File

@@ -68,7 +68,7 @@ validate_ip() {
error_exit "Invalid: (${TEST_IP})" error_exit "Invalid: (${TEST_IP})"
fi fi
done done
if ifconfig | grep -qw "${TEST_IP}"; then if ifconfig | grep -qwF "${TEST_IP}"; then
warn "Warning: IP address already in use (${TEST_IP})." warn "Warning: IP address already in use (${TEST_IP})."
else else
info "Valid: (${IP})." info "Valid: (${IP})."

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

@@ -91,7 +91,7 @@ validate_ip() {
exit 1 exit 1
fi fi
done done
if ifconfig | grep -qw "${TEST_IP}"; then if ifconfig | grep -qwF "${TEST_IP}"; then
warn "Warning: IP address already in use (${TEST_IP})." warn "Warning: IP address already in use (${TEST_IP})."
else else
info "Valid: (${ip})." info "Valid: (${ip})."

2
usr/local/share/bastille/start.sh
View File

@@ -79,7 +79,7 @@ for _jail in ${JAILS}; do
## warn if matching configured (but not online) ip4.addr, ignore if there's no ip4.addr entry ## warn if matching configured (but not online) ip4.addr, ignore if there's no ip4.addr entry
ip=$(bastille config "${_jail}" get ip4.addr) ip=$(bastille config "${_jail}" get ip4.addr)
if [ -n "${ip}" ]; then if [ -n "${ip}" ]; then
if ifconfig | grep -w "${ip}" >/dev/null; then if ifconfig | grep -wF "${ip}" >/dev/null; then
error_notify "Error: IP address (${ip}) already in use." error_notify "Error: IP address (${ip}) already in use."
continue continue
fi fi