diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-08 15:53:56 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-08 15:53:56 +0200 |
| commit | da323858ef34a0216aa96f4089810053c90f09ce (patch) | |
| tree | 6255edf3ad93f2ce0cee28856ec3de90915caccd /src/core/mount-setup.c | |
| parent | 4211d5bd135ae4c43bd2012ae5f327b1cc1596c0 (diff) | |
| parent | 75f86906c52735c98dc0aa7e24b773edb42ee814 (diff) | |
Merge pull request #1190 from poettering/rework-virt
basic: rework virtualization detection API
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 c6f3569915..e84f80b61b 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -164,7 +164,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 @@ -385,7 +385,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"); |