799437355d
- Add upstream patch 0001-systemd-tmpfiles-Fix-IGNORE_DIRECTORY_PATH-age-handl.patch for bsc#893797 - Drop renaming virtual interfaces in a guest (bnc#898432). Add 1088-drop-renaming-of-virtual-interfaces-in-guest.patch - Rename patch 0001-infinit-timeout-for-kmod-loaded-modules.patch to patch 1087-infinit-timeout-for-kmod-loaded-modules.patch and apply this one - Change patch 0003-mount-order-options-before-other-arguments-to-mount.patch to fix bsc#898240 - Add upstream patches 0001-Fix-warning-about-unused-variable-with-SELINUX.patch 0002-bus-remove-unused-check.patch - Add patch 0001-infinit-timeout-for-kmod-loaded-modules.patch to be able to avoid killing a running kmod/modprobe (bnc#889297) - Update patch 0001-bnc888612-logind-polkit-acpi.patch - Add upstream patches 0001-login-pause-devices-before-acknowledging-VT-switches.patch May help that history of the shell is saved 0001-nspawn-don-t-try-to-create-veth-link-with-too-long-i.patch 0001-socket-introduce-SELinuxContextFromNet-option.patch (bsc#897801) 0002-util-avoid-non-portable-__WORDSIZE.patch OBS-URL: https://build.opensuse.org/request/show/252537 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=208
40 lines
1.9 KiB
Diff
40 lines
1.9 KiB
Diff
Based on 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 | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
--- src/core/mount.c
|
|
+++ src/core/mount.c 2014-09-25 13:43:44.926563278 +0000
|
|
@@ -947,10 +947,11 @@ static void mount_enter_mounting(Mount *
|
|
r = exec_command_set(
|
|
m->control_command,
|
|
"/bin/mount",
|
|
+ "-n",
|
|
+ "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
|
|
+ "-o", m->parameters_fragment.options ? m->parameters_fragment.options : "defaults",
|
|
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;
|
|
@@ -994,10 +995,11 @@ static void mount_enter_remounting(Mount
|
|
r = exec_command_set(
|
|
m->control_command,
|
|
"/bin/mount",
|
|
- m->parameters_fragment.what,
|
|
- m->where,
|
|
+ "-n",
|
|
"-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
|
|
"-o", o,
|
|
+ m->parameters_fragment.what,
|
|
+ m->where,
|
|
NULL);
|
|
} else
|
|
r = -ENOENT;
|