Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions iocage_lib/ioc_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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():

Expand Down