1
0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 03:25:31 +03:00

mount: order options before other arguments to mount

This commit is contained in:
Emil Renner Berthing 2014-09-18 15:24:59 +02:00 committed by Tom Gundersen
parent fdb8bd0fe7
commit 141a1ceaa6

View File

@ -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;