Merge remote-tracking branch 'upstream/master'

2021-07-07 04:53:57 -04:00
parent b517d3aece 9f8b2514b3
commit 2f63bf3bbc
11 changed files with 117 additions and 33 deletions
@@ -32,7 +32,7 @@
 . /usr/local/etc/bastille/bastille.conf

 usage() {
-    error_exit "Usage: bastille create [option] name release ip [interface]"
+    error_exit "Usage: bastille create [empty|thick|vnet] name release ip [interface]"
 }

 running_jail() {
@@ -387,7 +387,11 @@ create_jail() {
            _gateway=''
            _ifconfig=SYNCDHCP
            if [ "${IP}" != "0.0.0.0" ]; then # not using DHCP, so set static address.
-                _ifconfig="inet ${IP}"
+                if [ -n "${ip6}" ]; then
+                    _ifconfig="inet6 ${IP}"
+                else
+                    _ifconfig="inet ${IP}"
+                fi
                if [ -n "${bastille_network_gateway}" ]; then
                    _gateway="${bastille_network_gateway}"
                else