From b77ffba65617c4001e85a31dc9673d0abe481fb8 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 29 Jan 2014 21:10:04 +0100
Subject: <stage32> Trigger network target as soon as possible if network/dhcp
 has been done in stage31

---
 .../data/etc/systemd/system/early-network-triggers.service             | 2 ++
 .../rootfs/rootfs-stage32/data/etc/systemd/system/network-dns.target   | 2 +-
 .../rootfs-stage32/data/etc/systemd/system/network-gateway.target      | 3 ++-
 remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service   | 1 -
 remote/rootfs/rootfs-stage32/data/etc/tmpfiles.d/network.conf          | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 remote/rootfs/rootfs-stage32/data/etc/tmpfiles.d/network.conf

(limited to 'remote/rootfs/rootfs-stage32/data/etc')

diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/early-network-triggers.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/early-network-triggers.service
index 7ed6e2a6..4713dae1 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/early-network-triggers.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/early-network-triggers.service
@@ -3,7 +3,9 @@
 [Unit]
 Description=Trigger network targets early
 DefaultDependencies=no
+Wants=systemd-tmpfiles-setup.service
 Before=sysinit.target
+After=systemd-tmpfiles-setup.service
 
 [Service]
 Type=oneshot
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-dns.target b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-dns.target
index c0b7793b..bc12cd1b 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-dns.target
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-dns.target
@@ -1,4 +1,4 @@
 [Unit]
-
 Description=DNS Server available
+ConditionPathExists=/run/network/dns-ready
 
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-gateway.target b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-gateway.target
index cfeb719c..770eb697 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-gateway.target
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-gateway.target
@@ -1,3 +1,4 @@
 [Unit]
-
 Description=Default route configured
+ConditionPathExists=/run/network/gateway-ready
+
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service
index a48375d0..ebaa9afb 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service
@@ -2,7 +2,6 @@
 Description=Update date from local time server
 After=network.target
 Requires=network.target
-ConditionPathExists=/run/udhcpc/network-ready
 
 [Service]
 Type=oneshot
diff --git a/remote/rootfs/rootfs-stage32/data/etc/tmpfiles.d/network.conf b/remote/rootfs/rootfs-stage32/data/etc/tmpfiles.d/network.conf
new file mode 100644
index 00000000..dd67e785
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/etc/tmpfiles.d/network.conf
@@ -0,0 +1 @@
+D /run/network 0755 root root
-- 
cgit v1.2.3-55-g7522