mount: order options before other arguments to mount

diff --git a/src/core/mount.c b/src/core/mount.c
index e284357c6ff72aa9710aa227540f581f3ed79712..f3ec7365d15178e9d3e1808cda1856c42b94cd1b 100644 (file)
--- 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",
                                 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,
                                 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;
                                 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",
                                 m->control_command,
                                 "/bin/mount",
                                 m->sloppy_options ? "-ns" : "-n",

-                                m->parameters_fragment.what,
-                                m->where,

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

+                                m->parameters_fragment.what,
+                                m->where,

                                 NULL);
         } else
                 r = -ENOENT;
                                 NULL);
         } else
                 r = -ENOENT;