From 1d4069aad5520d169dc3893cb689d09d24461dd9a2d1627e9d16915a1c918f7b Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Wed, 25 Jun 2014 14:14:00 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=684
---
 systemd-mini.changes |  5 +++++
 systemd-mini.spec    | 16 ++++++++++++++++
 systemd.changes      |  5 +++++
 systemd.spec         |  5 +++++
 4 files changed, 31 insertions(+)

diff --git a/systemd-mini.changes b/systemd-mini.changes
index 981c8c3d..3fac462e 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun 25 14:12:52 UTC 2014 - werner@suse.de
+
+- Temporary disable patch 1022 (bnc#884271 and bnc#882714
+
 -------------------------------------------------------------------
 Tue Jun 24 11:55:39 UTC 2014 - rmilasan@suse.com
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index a1b46519..8a79d06c 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -31,6 +31,7 @@
 %else
 %define has_efi 0
 %endif
+%bcond_with udevsettle
 
 Name:           systemd-mini
 Url:            http://www.freedesktop.org/wiki/Software/systemd
@@ -1141,7 +1142,11 @@ cp %{SOURCE7} m4/
 %patch1019 -p0
 %patch1020 -p0
 %patch1021 -p1
+%if 0%{?suse_version} > 1310
+%if %{with udevsettle}
 %patch1022 -p1
+%endif
+%endif
 %patch1023 -p0
 %patch1024 -p0
 %patch1025 -p1
@@ -1174,6 +1179,17 @@ else
   sed -ri 's@^([[:blank:]]+)(cmdline\[i\+\+\][[:blank:]]+=[[:blank:]]+"-l")(;)@\1/* \2 */\3@' src/fsck/fsck.c
 fi
 
+%if 0%{?suse_version} <= 1310
+#
+# Older versions like oS 13.1 do not distinguish between
+# network.target and network-online.target
+#
+for f in src/core/service.c src/insserv-generator/insserv-generator.c
+do
+  sed -ri '/"network",.*SPECIAL_NETWORK_ONLINE_TARGET,/{ s/SPECIAL_NETWORK_ONLINE_TARGET/SPECIAL_NETWORK_TARGET/}' $f
+done
+%endif
+
 %build
 cflags ()
 {
diff --git a/systemd.changes b/systemd.changes
index 981c8c3d..3fac462e 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun 25 14:12:52 UTC 2014 - werner@suse.de
+
+- Temporary disable patch 1022 (bnc#884271 and bnc#882714
+
 -------------------------------------------------------------------
 Tue Jun 24 11:55:39 UTC 2014 - rmilasan@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index 0bc178d3..69dc275b 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -29,6 +29,7 @@
 %else
 %define has_efi 0
 %endif
+%bcond_with udevsettle
 
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
@@ -1136,7 +1137,11 @@ cp %{SOURCE7} m4/
 %patch1019 -p0
 %patch1020 -p0
 %patch1021 -p1
+%if 0%{?suse_version} > 1310
+%if %{with udevsettle}
 %patch1022 -p1
+%endif
+%endif
 %patch1023 -p0
 %patch1024 -p0
 %patch1025 -p1