diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-10-06 15:44:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-06 15:44:27 +0200 |
| commit | e057995bb1314a94ce460d8e5a2a20e73c0e2ad4 (patch) | |
| tree | 6ca280b3a1526e61c9fed7b87854e2ba0ddb80c8 /src/core | |
| parent | 94f42fe3a68129fc5d30fc0ee2094c3052ea782b (diff) | |
| parent | 36d854780c01d589e5da1fc6e94f46aa41f7016f (diff) | |
Merge pull request #4280 from giuseppe/unprivileged-user
[RFC] run systemd in an unprivileged container
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/execute.c | 2 | ||||
| -rw-r--r-- | src/core/umount.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/execute.c b/src/core/execute.c index 82d8c978c1..019ff8490b 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -781,7 +781,7 @@ static int enforce_groups(const ExecContext *context, const char *username, gid_ k++; } - if (setgroups(k, gids) < 0) { + if (maybe_setgroups(k, gids) < 0) { free(gids); return -errno; } diff --git a/src/core/umount.c b/src/core/umount.c index c21a2be54e..1e5459ed80 100644 --- a/src/core/umount.c +++ b/src/core/umount.c @@ -375,7 +375,7 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e /* If we are in a container, don't attempt to read-only mount anything as that brings no real benefits, but might confuse the host, as we remount - the superblock here, not the bind mound. */ + the superblock here, not the bind mount. */ if (detect_container() <= 0) { _cleanup_free_ char *options = NULL; /* MS_REMOUNT requires that the data parameter |