From bcc54c5b45165162e2cc66f11054eb349294d50a Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Mon, 16 Jun 2014 11:41:47 -0700 Subject: [PATCH] coreos-base/oem-rackspace-teeth: Make cloudinit drop-in an actual unit This will guarentee that cloudinit reloads systemd's unit files. Also, fix the ordering on the config-drive mount. --- .../files/cloud-config.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/files/cloud-config.yml index 10a86eb34e..eeed0a4677 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/files/cloud-config.yml @@ -1,23 +1,20 @@ #cloud-config -write_files: - - path: /run/systemd/system/user-configdrive.service.d/netconf.conf - permissions: 0644 - content: | - [Service] - ExecStart= - ExecStart=/usr/bin/coreos-cloudinit --from-configdrive=/media/configdrive --convert-netconf=debian - coreos: units: + - name: user-configdrive.service.d/netconf.conf + runtime: yes + content: | + [Service] + ExecStart= + ExecStart=/usr/bin/coreos-cloudinit --from-configdrive=/media/configdrive --convert-netconf=debian - name: media-configdrive.mount command: start runtime: yes content: | [Unit] - DefaultDependencies=no - Conflicts=umount.target - Before=local-fs.target umount.target + Wants=user-configdrive.service + Before=user-configdrive.service [Mount] What=/dev/disk/by-label/config-2