From 040192862307c492f60a922ed111110c472b04b7 Mon Sep 17 00:00:00 2001 From: Geoffroy Desvernay Date: Sat, 13 Dec 2025 00:21:13 +0100 Subject: [PATCH] Change default domainname from "none" to "" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NIS domainname enables all nss NIS subsystem if not empty. This change could affect you if you are using NIS and your NIS domainname is "none". Otherwise, you may escape strange bugs where some program (here samba, or mountd) may take some (say ~30) seconds at jail startup or simply fail, waiting for a NIS server to reply for domainname "none"… should fix #96 --- iocage_lib/ioc_json.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/iocage_lib/ioc_json.py b/iocage_lib/ioc_json.py index 9ee96580..83d2ce07 100644 --- a/iocage_lib/ioc_json.py +++ b/iocage_lib/ioc_json.py @@ -434,7 +434,7 @@ def __init__(self, location, checking_datasets, silent, callback): @staticmethod def get_version(): """Sets the iocage configuration version.""" - version = '33' + version = '34' return version @@ -924,6 +924,10 @@ def check_config(self, conf, default=False): if not conf.get('allow_mount_linsysfs'): conf['allow_mount_linsysfs'] = 0 + # Version 34 change default domainname to empty + if conf.get('host_domainname') == 'none': + conf['host_domainname'] = '' + if not default: conf.update(jail_conf) @@ -1133,7 +1137,7 @@ def retrieve_default_props(): return { 'CONFIG_VERSION': IOCConfiguration.get_version(), 'interfaces': 'vnet0:bridge0', - 'host_domainname': 'none', + 'host_domainname': '', 'exec_fib': '0', 'ip4_addr': 'none', 'ip4_saddrsel': '1', @@ -1457,7 +1461,7 @@ def json_convert_from_zfs(self, uuid, skip=False): # Filter the props we want to convert. prop_prefix = "org.freebsd.iocage" - key_and_value = {"host_domainname": "none"} + key_and_value = {"host_domainname": ""} for key, prop in props.items():