From 2ff8abbd40feee90dbac8788efba2218b546df6c Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Thu, 2 Oct 2014 21:02:03 +0200

Subject: [PATCH] Revert "mount: order options before other arguments to mount"

This reverts commit 141a1ceaa62578f1ed14f04cae2113dd0f49fd7f.

People should fix their libc's getopt(), instead of us using a weird

option ordering...

---

 src/core/mount.c | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/mount.c b/src/core/mount.c

index f3ec7365d1..e284357c6f 100644

--- a/src/core/mount.c

+++ b/src/core/mount.c

@@ -903,10 +903,10 @@ static void mount_enter_mounting(Mount *m) {

                                 m->control_command,

                                 "/bin/mount",

                                 m->sloppy_options ? "-ns" : "-n",

-                                "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",

-                                "-o", m->parameters_fragment.options ? m->parameters_fragment.options : "",

                                 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;

@@ -951,10 +951,10 @@ static void mount_enter_remounting(Mount *m) {

                                 m->control_command,

                                 "/bin/mount",

                                 m->sloppy_options ? "-ns" : "-n",

-                                "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",

-                                "-o", o,

                                 m->parameters_fragment.what,

                                 m->where,

+                                "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",

+                                "-o", o,

                                 NULL);

         } else

                 r = -ENOENT;