[systemd-commits] 2 commits - NEWS units/network-online.target units/systemd-networkd-wait-online.service.in

[Lennart Poettering]

 NEWS                                          |   10 ++++++++++
 units/network-online.target                   |    1 +
 units/systemd-networkd-wait-online.service.in |    2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit dc1d6c02fcf55bb7dac918d0ed3bd3e2a3d67525
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 11 15:04:59 2014 +0200

    NEWS: add contributor list for 214

diff --git a/NEWS b/NEWS
index 018720f..71fa3a9 100644
--- a/NEWS
+++ b/NEWS
@@ -175,6 +175,16 @@ CHANGES WITH 214:
           added which is useful for services that shall run before any
           network is configured, for example firewall scripts.
 
+        Contributions from: Camilo Aguilar, Christian Hesse, Colin Ian
+        King, Cristian Rodríguez, Daniel Buch, Dave Reisner, David
+        Strauss, Denis Tikhomirov, John, Jonathan Liu, Kay Sievers,
+        Lennart Poettering, Mantas MikulÄ—nas, Mark Eichin, Ronny
+        Chevalier, Susant Sahani, Thomas Blume, Thomas Hindoe Paaboel
+        Andersen, Tom Gundersen, Umut Tezduyar Lindskog, Zbigniew
+        Jędrzejewski-Szmek
+
+        -- Berlin, 2014-06-11
+
 CHANGES WITH 213:
 
         * A new "systemd-timesyncd" daemon has been added for

commit 58e027023b47b32e42cf93dd4a629b869ee1ef25
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 11 14:58:32 2014 +0200

    units: order network-online.target after network.target
    
    There might be implementations around where the network-online logic
    might not talk to any network configuration service (and thus not have
    to wait for it), hence let's explicitly order network-online.target
    after network.target to avoid any ambiguities.

diff --git a/units/network-online.target b/units/network-online.target
index a40c44c..67bc4fa 100644
--- a/units/network-online.target
+++ b/units/network-online.target
@@ -9,3 +9,4 @@
 Description=Network is Online
 Documentation=man:systemd.special(7)
 Documentation=http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget
+After=network.target
diff --git a/units/systemd-networkd-wait-online.service.in b/units/systemd-networkd-wait-online.service.in
index a9bad7a..8597f7c 100644
--- a/units/systemd-networkd-wait-online.service.in
+++ b/units/systemd-networkd-wait-online.service.in
@@ -12,7 +12,7 @@ DefaultDependencies=no
 Conflicts=shutdown.target
 Requisite=systemd-networkd.service
 After=systemd-networkd.service
-Before=network-online.target
+Before=network.target network-online.target
 
 [Service]
 Type=oneshot