[systemd-devel] [RFC 23/25] mount: order options before other arguments to mount

2014-09-18 Thread Emil Renner Berthing 
---
 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 e284357..f3ec736 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;
-- 
2.1.0

___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel

Re: [systemd-devel] [RFC 23/25] mount: order options before other arguments to mount

2014-09-18 Thread Tom Gundersen 
Applied. Thanks!

Tom

On Thu, Sep 18, 2014 at 3:24 PM, Emil Renner Berthing syst...@esmil.dk wrote:
 ---
  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 e284357..f3ec736 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;
 --
 2.1.0

 ___
 systemd-devel mailing list
 systemd-devel@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/systemd-devel
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel