From 9d2774af3be31ad932b7ac3c7d4c3314ce6619e2 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sun, 15 Jun 2014 15:41:53 -0700
Subject: [PATCH] fix(build_image): Use developer_data as a system config.

Evaluating this as a user config causes it to block on
coreos-environment-setup.service which will wait on networking. This
makes it hard to add extra tricks for testing/debugging situations where
networking is failing. For example, to trigger dhcpcd if networkd dies:

    #cloud-config

    write_files:
      - path: /etc/systemd/system/systemd-networkd.service.d/dhcpcd.conf
        content: |
          [Unit]
          OnFailure=dhcpcd.service

          [Service]
          Restart=no
---
 build_library/build_image_util.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index 9c6ffbf22f..2a19fa5c11 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -198,8 +198,8 @@ finish_image() {
     local data_path="/usr/share/coreos/developer_data"
     local unit_path="usr-share-coreos-developer_data"
     sudo cp "${FLAGS_developer_data}" "${root_fs_dir}/${data_path}"
-    systemd_enable "${root_fs_dir}" user-config.target \
-        "user-cloudinit@.path" "user-cloudinit@${unit_path}.path"
+    systemd_enable "${root_fs_dir}" system-config.target \
+        "system-cloudinit@.service" "system-cloudinit@${unit_path}.service"
   fi
 
   write_contents "${root_fs_dir}" "${BUILD_DIR}/${image_contents}"