summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Renner Berthing <systemd@esmil.dk>2014-09-18 15:24:59 +0200
committerTom Gundersen <teg@jklm.no>2014-09-18 18:12:51 +0200
commit141a1ceaa62578f1ed14f04cae2113dd0f49fd7f (patch)
treeb729b270fb6a87be6e42bc7ef4d62253e98709a5
parentfdb8bd0fe7244b72ddc1c08e401ebddefdaf4f46 (diff)
mount: order options before other arguments to mount
-rw-r--r--src/core/mount.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/mount.c b/src/core/mount.c
index e284357c6f..f3ec7365d1 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",
- m->parameters_fragment.what,
- m->where,
"-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
"-o", o,
+ m->parameters_fragment.what,
+ m->where,
NULL);
} else
r = -ENOENT;