rebase missing So, manually fiexed

Author: himrock922

libioc/Config/Jail/Defaults.py

@@ -30,117 +30,7 @@
 import libioc.Config.Jail.Globals
 import libioc.Config.Jail.BaseConfig
 
-<<<<<<< HEAD
 _DEFAULTS = libioc.Config.Jail.Globals.DEFAULTS
-=======
-DEFAULTS = libioc.Config.Data.Data({
-    "CONFIG_VERSION": 17,
-    "id": None,
-    "release": None,
-    "boot": False,
-    "priority": 0,
-    "legacy": False,
-    "priority": 0,
-    "depends": [],
-    "basejail": False,
-    "basejail_type": "nullfs",
-    "clonejail": False,
-    "defaultrouter": None,
-    "defaultrouter6": None,
-    "mac_prefix": "02ff60",
-    "vnet": False,
-    "interfaces": [],
-    "vnet_default_interface": [],
-    "vnet_interfaces": [],
-    "ip4": "new",
-    "ip4_saddrsel": 1,
-    "ip4_addr": None,
-    "ip6": "new",
-    "ip6_saddrsel": 1,
-    "ip6_addr": None,
-    "resolver": "/etc/resolv.conf",
-    "host_hostuuid": None,
-    "host_hostname": None,
-    "host_domainname": None,
-    "host_time": True,
-    "hostid": None,
-    "hostid_strict_check": False,
-    "devfs_ruleset": 4,
-    "enforce_statfs": 2,
-    "children_max": 0,
-    "allow_set_hostname": 1,
-    "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",
-    "sysvshm": "new",
-    "exec_clean": 1,
-    "exec_fib": 1,
-    "exec_prestart": None,
-    "exec_created": None,
-    "exec_start": "/bin/sh /etc/rc",
-    "exec_poststart": None,
-    "exec_prestop": None,
-    "exec_stop": "/bin/sh /etc/rc.shutdown",
-    "exec_poststop": None,
-    "exec_system_user": "root",
-    "exec_system_jail_user": "root",
-    "exec_jail_user": "root",
-    "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
-})
->>>>>>> vnet_default_interfaces doesn't automatically change too, So [] passed
 
 
 class JailConfigDefaults(libioc.Config.Jail.BaseConfig.BaseConfig):