Merge pull request BastilleBSD#200 from cedwards/0_6_fixes

fix route auto-detect and SERVICE template
Elektrokongen · Apr 14, 2020 · 0ed07b4 · 0ed07b4
2 parents a95040a + 21937dd
commit 0ed07b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh
@@ -331,13 +331,13 @@ create_jail() {
             ## if 0.0.0.0 set DHCP
             ## else set static address
             if [ "${IP}" == "0.0.0.0" ]; then
-                /usr/sbin/sysrc -f "${bastille_jail_rc_conf}" ifconfig_vnet0="DHCP"
+                /usr/sbin/sysrc -f "${bastille_jail_rc_conf}" ifconfig_vnet0="SYNCDHCP"
             else
                 /usr/sbin/sysrc -f "${bastille_jail_rc_conf}" ifconfig_vnet0="inet ${IP}"
                 if [ -n "${bastille_network_gateway}" ]; then
                     /usr/sbin/sysrc -f "${bastille_jail_rc_conf}" defaultrouter="${bastille_network_gateway}"
                 else
-                    /usr/sbin/sysrc -f "${bastille_jail_rc_conf}" defaultrouter="$(route show default | awk '/gateway/ {print $2}')"
+                    /usr/sbin/sysrc -f "${bastille_jail_rc_conf}" defaultrouter="$(netstat -rn | awk '/default/ {print $2}')"
                 fi
             fi
 

diff --git a/usr/local/share/bastille/template.sh b/usr/local/share/bastille/template.sh
@@ -266,7 +266,7 @@ for _jail in ${JAILS}; do
     if [ -s "${bastille_template}/SERVICE" ]; then
         echo -e "${COLOR_GREEN}[${_jail}]:SERVICE -- START${COLOR_RESET}"
         while read _service; do
-            jexec -l "${_jail}" /usr/sbin/service "${_service}" || exit 1
+            jexec -l "${_jail}" /usr/sbin/service ${_service} || exit 1
         done < "${bastille_template}/SERVICE"
         echo -e "${COLOR_GREEN}[${_jail}]:SERVICE -- END${COLOR_RESET}"
         echo