From f3e2a2da3771b80f28bf37e92408a5e0a0ae1ddc Mon Sep 17 00:00:00 2001 From: User Himrock922 Date: Sat, 23 Feb 2019 13:45:10 +0900 Subject: [PATCH 1/6] after rebase execute, confflict log mixed PR. So, recreate branch... --- libioc/Config/Jail/Globals.py | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/libioc/Config/Jail/Globals.py b/libioc/Config/Jail/Globals.py index 92eaa5c7..74e51f38 100644 --- 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,8 +64,10 @@ "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, @@ -70,7 +75,17 @@ "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 }) From 22d259244a5c157fe4c7811086095963ee48f065 Mon Sep 17 00:00:00 2001 From: User Himrock922 Date: Sun, 24 Feb 2019 01:55:06 +0900 Subject: [PATCH 2/6] set default parameter when feature/add_config fixed --- libioc/Config/Jail/Globals.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libioc/Config/Jail/Globals.py b/libioc/Config/Jail/Globals.py index 74e51f38..91eab2ba 100644 --- a/libioc/Config/Jail/Globals.py +++ b/libioc/Config/Jail/Globals.py @@ -42,7 +42,7 @@ "mac_prefix": "02ff60", "vnet": False, "interfaces": [], - "vnet_default_interface": None, + "vnet_default_interface": [], "vnet_interfaces": [], "ip4": "new", "ip4_saddrsel": 1, @@ -99,9 +99,9 @@ "exec_prestop": None, "exec_stop": "/bin/sh /etc/rc.shutdown", "exec_poststop": None, - "exec_system_user": False, + "exec_system_user": "root", + "exec_system_jail_user": "root", "exec_jail_user": "root", - "exec_system_jail_user": False, "exec_timeout": "600", "stop_timeout": "30", "mount_procfs": "0", From 8554707075f6ac148daa12d9002df82524127999 Mon Sep 17 00:00:00 2001 From: User Himrock922 Date: Sun, 24 Feb 2019 22:37:14 +0900 Subject: [PATCH 3/6] ref https://github.com/bsdci/libioc/pull/630#discussion_r253302996 allow_mlock propetry changes from 0 to None. --- libioc/Config/Jail/Globals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libioc/Config/Jail/Globals.py b/libioc/Config/Jail/Globals.py index 91eab2ba..c4828fca 100644 --- a/libioc/Config/Jail/Globals.py +++ b/libioc/Config/Jail/Globals.py @@ -64,7 +64,7 @@ "allow_sysvipc": 0, "allow_raw_sockets": 0, "allow_chflags": 0, - "allow_mlock": 0, + "allow_mlock": None, "allow_mount": 0, "allow_mount_devfs": 0, "allow_mount_fusefs": 0, From 3dd20a9cf7a48dcf3eea4c9a0a9c459005c4743a Mon Sep 17 00:00:00 2001 From: User Himrock922 Date: Mon, 25 Feb 2019 00:17:11 +0900 Subject: [PATCH 4/6] ref https://github.com/bsdci/libioc/pull/630#discussion_r253302996 ref2 https://www.freebsd.org/cgi/man.cgi?jail(8) enforce_staffs property equal 2 So, set allow_mount_fusefs values False(0) --- libioc/Config/Jail/Globals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libioc/Config/Jail/Globals.py b/libioc/Config/Jail/Globals.py index c4828fca..9f0bdd04 100644 --- a/libioc/Config/Jail/Globals.py +++ b/libioc/Config/Jail/Globals.py @@ -67,7 +67,7 @@ "allow_mlock": None, "allow_mount": 0, "allow_mount_devfs": 0, - "allow_mount_fusefs": 0, + "allow_mount_fusefs": False, "allow_mount_nullfs": 0, "allow_mount_procfs": 0, "allow_mount_fdescfs": 0, From ab776c1ea661922ca9d59f0227942eb563348676 Mon Sep 17 00:00:00 2001 From: User Himrock922 Date: Mon, 25 Feb 2019 22:19:18 +0900 Subject: [PATCH 5/6] CONFIG_VERSION delete --- libioc/Config/Jail/Globals.py | 1 - 1 file changed, 1 deletion(-) diff --git a/libioc/Config/Jail/Globals.py b/libioc/Config/Jail/Globals.py index 9f0bdd04..bea46df8 100644 --- a/libioc/Config/Jail/Globals.py +++ b/libioc/Config/Jail/Globals.py @@ -26,7 +26,6 @@ DEFAULTS = libioc.Config.Data.Data({ - "CONFIG_VERSION": 17, "id": None, "release": None, "boot": False, From 480c18a57c9077df92b5ff71bd9bc3a4c0054ff8 Mon Sep 17 00:00:00 2001 From: User Himrock922 Date: Mon, 25 Feb 2019 23:13:44 +0900 Subject: [PATCH 6/6] allow_mount_* parameters fix from 0 to False. Also duplicate parameter does delete. --- libioc/Config/Jail/Globals.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libioc/Config/Jail/Globals.py b/libioc/Config/Jail/Globals.py index bea46df8..c3f8a53c 100644 --- a/libioc/Config/Jail/Globals.py +++ b/libioc/Config/Jail/Globals.py @@ -31,7 +31,6 @@ "boot": False, "priority": 0, "legacy": False, - "priority": 0, "depends": [], "basejail": False, "basejail_type": "nullfs", @@ -64,14 +63,14 @@ "allow_raw_sockets": 0, "allow_chflags": 0, "allow_mlock": None, - "allow_mount": 0, - "allow_mount_devfs": 0, + "allow_mount": False, + "allow_mount_devfs": False, "allow_mount_fusefs": False, - "allow_mount_nullfs": 0, - "allow_mount_procfs": 0, - "allow_mount_fdescfs": 0, - "allow_mount_zfs": 0, - "allow_mount_tmpfs": 0, + "allow_mount_nullfs": False, + "allow_mount_procfs": False, + "allow_mount_fdescfs": False, + "allow_mount_zfs": False, + "allow_mount_tmpfs": False, "allow_quotas": 0, "allow_socket_af": 0, "allow_tun": 0,