Skip to content

Commit f3e2a2d

Browse files
committed
after rebase execute, confflict log mixed PR. So, recreate branch...
1 parent 38c1748 commit f3e2a2d

File tree

1 file changed

+32
-1
lines changed

1 file changed

+32
-1
lines changed

libioc/Config/Jail/Globals.py

+32-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727

2828
DEFAULTS = libioc.Config.Data.Data({
29+
"CONFIG_VERSION": 17,
2930
"id": None,
3031
"release": None,
3132
"boot": False,
@@ -41,6 +42,7 @@
4142
"mac_prefix": "02ff60",
4243
"vnet": False,
4344
"interfaces": [],
45+
"vnet_default_interface": None,
4446
"vnet_interfaces": [],
4547
"ip4": "new",
4648
"ip4_saddrsel": 1,
@@ -52,6 +54,7 @@
5254
"host_hostuuid": None,
5355
"host_hostname": None,
5456
"host_domainname": None,
57+
"host_time": True,
5558
"hostid": None,
5659
"hostid_strict_check": False,
5760
"devfs_ruleset": 4,
@@ -61,16 +64,28 @@
6164
"allow_sysvipc": 0,
6265
"allow_raw_sockets": 0,
6366
"allow_chflags": 0,
67+
"allow_mlock": 0,
6468
"allow_mount": 0,
6569
"allow_mount_devfs": 0,
70+
"allow_mount_fusefs": 0,
6671
"allow_mount_nullfs": 0,
6772
"allow_mount_procfs": 0,
6873
"allow_mount_fdescfs": 0,
6974
"allow_mount_zfs": 0,
7075
"allow_mount_tmpfs": 0,
7176
"allow_quotas": 0,
7277
"allow_socket_af": 0,
78+
"allow_tun": 0,
7379
"allow_vmm": False,
80+
"available": 0,
81+
"bpf": None,
82+
"comment": None,
83+
"compression": None,
84+
"compressratio": None,
85+
"count": None,
86+
"cpuset": False,
87+
"dedup": False,
88+
"dhcp": False,
7489
"rlimits": None,
7590
"sysvmsg": "new",
7691
"sysvsem": "new",
@@ -84,20 +99,36 @@
8499
"exec_prestop": None,
85100
"exec_stop": "/bin/sh /etc/rc.shutdown",
86101
"exec_poststop": None,
102+
"exec_system_user": False,
87103
"exec_jail_user": "root",
104+
"exec_system_jail_user": False,
88105
"exec_timeout": "600",
89106
"stop_timeout": "30",
90107
"mount_procfs": "0",
91108
"mount_devfs": "1",
92109
"mount_fdescfs": "0",
110+
"mount_linprocfs": "0",
93111
"securelevel": 2,
112+
"mountpoint": "0",
113+
"notes": None,
114+
"origin": None,
115+
"owner": None,
116+
"quota": None,
117+
"reservation": None,
118+
"rtsold": None,
119+
"sync_state": None,
120+
"sync_target": None,
121+
"sync_tgt_zpool": None,
94122
"tags": [],
95123
"template": False,
124+
"used": False,
96125
"jail_zfs": False,
97126
"jail_zfs_dataset": None,
127+
"jail_zfs_mountpoint": None,
98128
"provision": {
99129
"method": None,
100130
"source": None,
101131
"rev": "master"
102-
}
132+
},
133+
"last_started": None
103134
})

0 commit comments

Comments
 (0)