From 9f1ede62d2e1589b1454934c1605548defa9d806d7e31a78b26313a9c360d0cf Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Thu, 25 Sep 2014 13:53:13 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=791
---
 ...r-options-before-other-arguments-to-mount.patch | 14 +++++++-------
 systemd.changes                                    |  7 +++++++
 systemd.spec                                       |  3 ++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/0003-mount-order-options-before-other-arguments-to-mount.patch b/0003-mount-order-options-before-other-arguments-to-mount.patch
index 79c0b3ce..d777869d 100644
--- a/0003-mount-order-options-before-other-arguments-to-mount.patch
+++ b/0003-mount-order-options-before-other-arguments-to-mount.patch
@@ -8,18 +8,18 @@ Subject: [PATCH] mount: order options before other arguments to mount
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 --- src/core/mount.c
-+++ src/core/mount.c	2014-09-19 10:13:51.638238597 +0000
++++ src/core/mount.c	2014-09-25 13:43:44.926563278 +0000
 @@ -947,10 +947,11 @@ static void mount_enter_mounting(Mount *
                  r = exec_command_set(
                                  m->control_command,
                                  "/bin/mount",
--                                m->parameters_fragment.what,
--                                m->where,
 +                                "-n",
-                                 "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
-                                 m->parameters_fragment.options ? "-o" : NULL, m->parameters_fragment.options,
-+                                m->parameters_fragment.what,
-+                                m->where,
++                                "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
++                                "-o", m->parameters_fragment.options ? m->parameters_fragment.options : "defaults",
+                                 m->parameters_fragment.what,
+                                 m->where,
+-                                "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
+-                                m->parameters_fragment.options ? "-o" : NULL, m->parameters_fragment.options,
                                  NULL);
          else
                  r = -ENOENT;
diff --git a/systemd.changes b/systemd.changes
index f6077e12..bf68e5ed 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 25 13:45:46 UTC 2014 - werner@suse.de
+
+- Change patch
+  0003-mount-order-options-before-other-arguments-to-mount.patch
+  to fix bsc#898240 
+
 -------------------------------------------------------------------
 Thu Sep 25 09:06:14 UTC 2014 - werner@suse.de
 
diff --git a/systemd.spec b/systemd.spec
index a1d3bcc4..d19a9e1c 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1660,7 +1660,8 @@ cp %{SOURCE7} m4/
 %patch423 -p0
 %patch424 -p0
 %patch425 -p0
-%patch426 -p0
+%patch426 -p0 -b .xy
+exit 1
 %patch427 -p0
 %patch428 -p0
 %patch429 -p0