From f5c4dde1d32a73291e5390b00374a47b5c46de34 Mon Sep 17 00:00:00 2001
From: Vito Caputo <vito.caputo@coreos.com>
Date: Wed, 19 Aug 2015 18:15:05 -0700
Subject: [PATCH] sys-apps/ignition: move network depdencies to ignition
 services

Explicitly order ignition-{disks,files} after the network units, and
switch from Requires to Wants in so ignition can still function without
them.
---
 .../sys-apps/ignition/files/ignition-disks.service        | 8 ++++++++
 .../sys-apps/ignition/files/ignition-files.service        | 8 ++++++++
 .../sys-apps/ignition/files/ignition.target               | 8 --------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service
index f3424b2720..e0aa9a917a 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service
@@ -8,6 +8,14 @@ Before=local-fs-pre.target
 Requires=mnt-oem.mount
 After=mnt-oem.mount
 
+# setup networking
+Wants=initrd-systemd-networkd.service
+After=initrd-systemd-networkd.service
+
+# generate resolv.conf
+Wants=initrd-systemd-resolved.service
+After=initrd-systemd-resolved.service
+
 [Service]
 Type=oneshot
 TimeoutStartSec=30s
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service
index bccbca3d62..c147e545a8 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service
@@ -9,6 +9,14 @@ After=initrd-root-fs.target
 Requires=mnt-oem.mount
 After=mnt-oem.mount
 
+# setup networking
+Wants=initrd-systemd-networkd.service
+After=initrd-systemd-networkd.service
+
+# generate resolv.conf
+Wants=initrd-systemd-resolved.service
+After=initrd-systemd-resolved.service
+
 [Service]
 Type=oneshot
 TimeoutStartSec=30s
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target
index 7043896ef2..305a8a74a6 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target
@@ -10,11 +10,3 @@ After=ignition-disks.service
 
 Requires=ignition-files.service
 After=ignition-files.service
-
-# setup networking
-Requires=initrd-systemd-networkd.service
-After=initrd-systemd-networkd.service
-
-# generate resolv.conf
-Requires=initrd-systemd-resolved.service
-After=initrd-systemd-resolved.service