a few tweaks and some more preventing curtin from doing what it does by default

This commit is contained in:
Michael Hudson-Doyle 2017-03-17 13:28:35 +13:00
parent fb995c8209
commit a53b6cf80a
1 changed files with 4 additions and 3 deletions

View File

@ -143,7 +143,7 @@ def curtin_write_network_config(netplan_config):
curtin_conf = {
'write_files': {
'netplan': {
'path': '/etc/netplan/00-installer.yaml',
'path': 'etc/netplan/00-installer.yaml',
'content': netplan_config,
'permissions': '0600',
},
@ -151,10 +151,11 @@ def curtin_write_network_config(netplan_config):
'path': 'etc/cloud/cloud.cfg.d/subiquity-disable-cloudinit-networking.cfg',
'content': 'network: {config: disabled}\n',
}
}
},
'network_commands': {'builtin': []},
}
curtin_config = yaml.dump(curtin_conf, default_flow_style=False)
datestr = '# Autogenerated by SUbiquity: {} UTC'.format(
datestr = '# Autogenerated by SUbiquity: {} UTC\n'.format(
str(datetime.datetime.utcnow()))
with open(CURTIN_NETWORK_CONFIG_FILE, 'w') as conf:
conf.write(datestr)