[systemd-devel] [PATCH 2/4] mount-setup: introduce mount_setup_run_dirs()

[Lennart Poettering]

On Thu, 02.10.14 09:57, Michal Sekletar (msekleta at redhat.com) wrote:

> In cases when we are running as system manager, but we don't have the
> capability to mount filesystems don't call mount_setup(). However we
> assume that some directories (e.g. /run/systemd) are always
> around. Hence don't create those directories in mount_setup().
> ---
>  src/core/main.c        |  7 ++++++-
>  src/core/mount-setup.c | 20 ++++++++++++--------
>  src/core/mount-setup.h |  1 +
>  3 files changed, 19 insertions(+), 9 deletions(-)
> 
> diff --git a/src/core/main.c b/src/core/main.c
> index 1a62e04..fcd9471 100644
> --- a/src/core/main.c
> +++ b/src/core/main.c
> @@ -1393,10 +1393,15 @@ int main(int argc, char *argv[]) {
>  
>          /* Mount /proc, /sys and friends, so that /proc/cmdline and
>           * /proc/$PID/fd is available. */
> -        if (getpid() == 1) {
> +        if (getpid() == 1 && have_effective_cap(CAP_SYS_ADMIN)) {
>                  r = mount_setup(loaded_policy);
>                  if (r < 0)
>                          goto finish;

Hmm, is this really necessary? I mean, the code in mount_setup() will
anyway only mount what is missing, but not overmount what is already
mounted. Hence, if a container manager mounts everything properly,
then mount_setup() should be a NOP anyway... 

Lennart

-- 
Lennart Poettering, Red Hat