Based on 141a1ceaa62578f1ed14f04cae2113dd0f49fd7f Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <systemd@esmil.dk>
Date: Thu, 18 Sep 2014 15:24:59 +0200
Subject: [PATCH] mount: order options before other arguments to mount

---
 src/core/mount.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

--- src/core/mount.c
+++ 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",
+                                "-n",
+                                "-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;
@@ -994,10 +995,11 @@ static void mount_enter_remounting(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",
                                 "-o", o,
+                                m->parameters_fragment.what,
+                                m->where,
                                 NULL);
         } else
                 r = -ENOENT;