From 1cb6cef6fb644031eee05521098112a3c17f01d3eafdd8b8b05d4cb14ea9b1e2 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 26 Jun 2014 06:46:39 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=689 --- ...ork-online.target-after-network.targ.patch | 20 +++++++++++++++++++ systemd-mini.changes | 7 +++++++ systemd-mini.spec | 3 +++ systemd.changes | 7 +++++++ systemd.spec | 3 +++ 5 files changed, 40 insertions(+) create mode 100644 0001-units-order-network-online.target-after-network.targ.patch diff --git a/0001-units-order-network-online.target-after-network.targ.patch b/0001-units-order-network-online.target-after-network.targ.patch new file mode 100644 index 00000000..d09fa29e --- /dev/null +++ b/0001-units-order-network-online.target-after-network.targ.patch @@ -0,0 +1,20 @@ +Based on 58e027023b47b32e42cf93dd4a629b869ee1ef25 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 11 Jun 2014 14:58:32 +0200 +Subject: [PATCH] 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. +--- + units/network-online.target | 1 + + 1 file changed, 1 insertion(+) + +--- units/network-online.target ++++ units/network-online.target 2014-06-26 00:00:00.000000000 +0000 +@@ -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/systemd-mini.changes b/systemd-mini.changes index 21c28d21..2959085d 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jun 26 06:44:09 UTC 2014 - werner@suse.de + +- Add upstream patch + 0001-units-order-network-online.target-after-network.targ.patch + to make sure that etwork-online.target follows network.target + ------------------------------------------------------------------- Wed Jun 25 18:09:52 UTC 2014 - rmilasan@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index c691d2b2..bf733d82 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -597,6 +597,8 @@ Patch293: 0003-core-You-can-not-put-the-cached-result-of-use_smack-.patch Patch294: 0004-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch # PATCH-FIX-UPSTREAM added at 2014/06/25 Patch295: 0005-man-fix-path-in-crypttab-5.patch +# PATCH-FIX-UPSTREAM added at 2014/06/26 +Patch296: 0001-units-order-network-online.target-after-network.targ.patch # UDEV PATCHES # ============ @@ -1137,6 +1139,7 @@ cp %{SOURCE7} m4/ %patch293 -p0 %patch294 -p0 %patch295 -p0 +%patch296 -p0 # udev patches %patch1001 -p1 diff --git a/systemd.changes b/systemd.changes index 21c28d21..2959085d 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jun 26 06:44:09 UTC 2014 - werner@suse.de + +- Add upstream patch + 0001-units-order-network-online.target-after-network.targ.patch + to make sure that etwork-online.target follows network.target + ------------------------------------------------------------------- Wed Jun 25 18:09:52 UTC 2014 - rmilasan@suse.com diff --git a/systemd.spec b/systemd.spec index 06dab006..cfaac1d7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -592,6 +592,8 @@ Patch293: 0003-core-You-can-not-put-the-cached-result-of-use_smack-.patch Patch294: 0004-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch # PATCH-FIX-UPSTREAM added at 2014/06/25 Patch295: 0005-man-fix-path-in-crypttab-5.patch +# PATCH-FIX-UPSTREAM added at 2014/06/26 +Patch296: 0001-units-order-network-online.target-after-network.targ.patch # UDEV PATCHES # ============ @@ -1132,6 +1134,7 @@ cp %{SOURCE7} m4/ %patch293 -p0 %patch294 -p0 %patch295 -p0 +%patch296 -p0 # udev patches %patch1001 -p1