diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-03-29 10:06:16 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-29 10:48:15 +0200 |
| commit | fdff7397c22a853e7e66ec72adb85c3f2f519f32 (patch) | |
| tree | 8a47f1b1aba281c075c8f76b5d0e90973958c443 /src/core/mount-setup.c | |
| parent | 64b485bf89b90042c9a624633b038ef417b0325e (diff) | |
[3/5] Apply missing fixes from upstream
Diffstat (limited to 'src/core/mount-setup.c')
| -rw-r--r-- | src/core/mount-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index 9c9675085..9dfa77823 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -181,7 +181,7 @@ static int mount_one(const MountPoint *p, bool relabel) { return 0; /* Skip securityfs in a container */ - if (!(p->mode & MNT_IN_CONTAINER) && detect_container(NULL) > 0) + if (!(p->mode & MNT_IN_CONTAINER) && detect_container() > 0) return 0; /* The access mode here doesn't really matter too much, since @@ -412,7 +412,7 @@ int mount_setup(bool loaded_policy) { * nspawn and the container tools work out of the box. If * specific setups need other settings they can reset the * propagation mode to private if needed. */ - if (detect_container(NULL) <= 0) + if (detect_container() <= 0) if (mount(NULL, "/", NULL, MS_REC|MS_SHARED, NULL) < 0) log_warning_errno(errno, "Failed to set up the root directory for shared mount propagation: %m"); |