From a53b6cf80a2f4c2f9dd995b10392b6e9b5458799 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Fri, 17 Mar 2017 13:28:35 +1300
Subject: [PATCH] a few tweaks and some more preventing curtin from doing what
 it does by default

---
 subiquity/curtin.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/subiquity/curtin.py b/subiquity/curtin.py
index dc1f18d4..0710ebe8 100644
--- a/subiquity/curtin.py
+++ b/subiquity/curtin.py
@@ -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)