after rebase execute, confflict log mixed PR. So, recreate branch...

bsdci · Feb 24, 2019 · f3e2a2d · f3e2a2d
1 parent 38c1748
commit f3e2a2d
Showing 1 changed file with 32 additions and 1 deletion.
diff --git a/libioc/Config/Jail/Globals.py b/libioc/Config/Jail/Globals.py
@@ -26,6 +26,7 @@
 
 
 DEFAULTS = libioc.Config.Data.Data({
+    "CONFIG_VERSION": 17,
     "id": None,
     "release": None,
     "boot": False,
@@ -41,6 +42,7 @@
     "mac_prefix": "02ff60",
     "vnet": False,
     "interfaces": [],
+    "vnet_default_interface": None,
     "vnet_interfaces": [],
     "ip4": "new",
     "ip4_saddrsel": 1,
@@ -52,6 +54,7 @@
     "host_hostuuid": None,
     "host_hostname": None,
     "host_domainname": None,
+    "host_time": True,
     "hostid": None,
     "hostid_strict_check": False,
     "devfs_ruleset": 4,
@@ -61,16 +64,28 @@
     "allow_sysvipc": 0,
     "allow_raw_sockets": 0,
     "allow_chflags": 0,
+    "allow_mlock": 0,
     "allow_mount": 0,
     "allow_mount_devfs": 0,
+    "allow_mount_fusefs": 0,
     "allow_mount_nullfs": 0,
     "allow_mount_procfs": 0,
     "allow_mount_fdescfs": 0,
     "allow_mount_zfs": 0,
     "allow_mount_tmpfs": 0,
     "allow_quotas": 0,
     "allow_socket_af": 0,
+    "allow_tun": 0,
     "allow_vmm": False,
+    "available": 0,
+    "bpf": None,
+    "comment": None,
+    "compression": None,
+    "compressratio": None,
+    "count": None,
+    "cpuset": False,
+    "dedup": False,
+    "dhcp": False,
     "rlimits": None,
     "sysvmsg": "new",
     "sysvsem": "new",
@@ -84,20 +99,36 @@
     "exec_prestop": None,
     "exec_stop": "/bin/sh /etc/rc.shutdown",
     "exec_poststop": None,
+    "exec_system_user": False,
     "exec_jail_user": "root",
+    "exec_system_jail_user": False,
     "exec_timeout": "600",
     "stop_timeout": "30",
     "mount_procfs": "0",
     "mount_devfs": "1",
     "mount_fdescfs": "0",
+    "mount_linprocfs": "0",
     "securelevel": 2,
+    "mountpoint": "0",
+    "notes": None,
+    "origin": None,
+    "owner": None,
+    "quota": None,
+    "reservation": None,
+    "rtsold": None,
+    "sync_state": None,
+    "sync_target": None,
+    "sync_tgt_zpool": None,
     "tags": [],
     "template": False,
+    "used": False,
     "jail_zfs": False,
     "jail_zfs_dataset": None,
+    "jail_zfs_mountpoint": None,
     "provision": {
         "method": None,
         "source": None,
         "rev": "master"
-    }
+    },
+    "last_started": None
 })