Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2026-03-24 09:52:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

clone: fix getting IPv6 (again)

Browse Source
This commit is contained in:
tschettervictor
2025-12-13 16:33:57 -07:00
committed by GitHub
parent 59f0fb3cd1
commit b4103f20ab
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,12 +198,6 @@ update_jailconf() {
local jail_config="${bastille_jailsdir}/${NEWNAME}/jail.conf"
if grep -qw "vnet;" "${jail_config}"; then
VNET_JAIL=1
else
VNET_JAIL=0
fi
if [ -f "${jail_config}" ]; then
if ! grep -qw "path = ${bastille_jailsdir}/${NEWNAME}/root;" "${jail_config}"; then
sed -i '' "s|host.hostname = ${TARGET};|host.hostname = ${NEWNAME};|" "${jail_config}"
@@ -486,6 +480,15 @@ clone_jail() {
if ! [ -d "${bastille_jailsdir}/${NEWNAME}" ]; then
local jail_config="${bastille_jailsdir}/${TARGET}/jail.conf"
local jail_rc_config="${bastille_jailsdir}/${TARGET}/root/etc/rc.conf"
if grep -qw "vnet;" "${jail_config}"; then
VNET_JAIL=1
else
VNET_JAIL=0
fi
if [ -n "${IP}" ]; then
validate_ips
else
@@ -495,12 +498,12 @@ clone_jail() {
# Validate proper IP settings
if [ "$(bastille config ${TARGET} get vnet)" != "not set" ]; then
# VNET
if grep -Eoqx 'ifconfig_vnet0="[^"]"' "${bastille_jailsdir}/${TARGET}/root/etc/rc.conf"; then
if grep -Eoqx 'ifconfig_vnet0="[^"]"' "${jail_rc_config}"; then
if [ -z "${IP4_ADDR}" ]; then
error_exit "[ERROR]: IPv4 not set. Retry with a proper IPv4 address."
fi
fi
if grep -Eoqx 'ifconfig_vnet0_ipv6="[^"]"' "${bastille_jailsdir}/${TARGET}/root/etc/rc.conf"; then
if grep -Eoqx 'ifconfig_vnet0_ipv6="[^"]"' "${jail_rc_config}"; then
if [ -z "${IP6_ADDR}" ]; then
error_exit "[ERROR]: IPv6 not set. Retry with a proper IPv6 address."
fi