diff options
author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-07-22 09:10:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-22 09:10:04 +0200 |
commit | 5c3c778014f4c59dd97f31ca5ab2e7374f08bbf6 (patch) | |
tree | e6df4d9329c86dbc7c0905e9f138696457f7fe47 /src/nspawn/nspawn.c | |
parent | 31d28eabc10967daf06ae6ac4959a59556f1e7ff (diff) | |
parent | c0f81393d137a258a5c255755c08b498860a5241 (diff) |
Merge pull request #3764 from poettering/assorted-stuff-2
Assorted fixes
Diffstat (limited to 'src/nspawn/nspawn.c')
-rw-r--r-- | src/nspawn/nspawn.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index e4be0a2251..6c8263d3d5 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -101,9 +101,11 @@ #include "util.h" /* Note that devpts's gid= parameter parses GIDs as signed values, hence we stay away from the upper half of the 32bit - * UID range here */ + * UID range here. We leave a bit of room at the lower end and a lot of room at the upper end, so that other subsystems + * may have their own allocation ranges too. */ #define UID_SHIFT_PICK_MIN ((uid_t) UINT32_C(0x00080000)) #define UID_SHIFT_PICK_MAX ((uid_t) UINT32_C(0x6FFF0000)) + /* nspawn is listening on the socket at the path in the constant nspawn_notify_socket_path * nspawn_notify_socket_path is relative to the container * the init process in the container pid can send messages to nspawn following the sd_notify(3) protocol */ @@ -277,7 +279,6 @@ static void help(void) { , program_invocation_short_name); } - static int custom_mounts_prepare(void) { unsigned i; int r; |