Merge pull request #843 from tschettervictor/fix-create-thick-vnet

create: Fix VNeT template not applying when mixed with thick or thin …
BastilleBSD · Feb 21, 2025 · ac39928 · ac39928
2 parents d7a66a2 + cb7c5da
commit ac39928
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh
@@ -571,9 +571,10 @@ create_jail() {
             fi
             # Join together IPv4 and IPv6 parts of ifconfig
             _ifconfig="${_ifconfig_inet} ${_ifconfig_inet6}"
-            bastille template "${NAME}" ${bastille_template_vnet} --arg BASE_TEMPLATE="${bastille_template_base}" --arg HOST_RESOLV_CONF="${bastille_resolv_conf}" --arg EPAIR="${uniq_epair}" --arg GATEWAY="${_gateway}" --arg GATEWAY6="${_gateway6}" --arg IFCONFIG="${_ifconfig}"
+            bastille template "${NAME}" ${bastille_template_vnet} --arg EPAIR="${uniq_epair}" --arg GATEWAY="${_gateway}" --arg GATEWAY6="${_gateway6}" --arg IFCONFIG="${_ifconfig}"
         fi
-    elif [ -n "${THICK_JAIL}" ]; then
+    fi
+    if [ -n "${THICK_JAIL}" ]; then
         if [ -n "${bastille_template_thick}" ]; then
             bastille template "${NAME}" ${bastille_template_thick} --arg BASE_TEMPLATE="${bastille_template_base}" --arg HOST_RESOLV_CONF="${bastille_resolv_conf}"
         fi

diff --git a/usr/local/share/bastille/templates/default/vnet/Bastillefile b/usr/local/share/bastille/templates/default/vnet/Bastillefile
@@ -1,8 +1,3 @@
-ARG BASE_TEMPLATE=default/base
-ARG HOST_RESOLV_CONF=/etc/resolv.conf
-
-INCLUDE ${BASE_TEMPLATE} --arg HOST_RESOLV_CONF="${HOST_RESOLV_CONF}"
-
 ARG EPAIR
 ARG GATEWAY
 ARG GATEWAY6