systemd/0302-mount-order-options-before-other-arguments-to-mount.patch
Zbigniew Jędrzejewski-Szmek 708deb95da Update to latest git
2014-10-07 22:56:19 -04:00

40 lines
1.9 KiB
Diff

From 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 | 8 ++++----
1 file 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;