SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23835 from yuwata/nspawn-private-users-identity

Browse Source 
nspawn: follow-ups for --private-users=identity
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2022-07-02 12:58:06 +02:00
committed by GitHub
parent 0e85550eb5 5ad08191d8
commit 4b2942aaea
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn-settings.c
+5
View File
@@ -623,6 +623,11 @@ int config_parse_private_users(
settings->userns_mode = USER_NAMESPACE_PICK;
settings->uid_shift = UID_INVALID;
settings->uid_range = UINT32_C(0x10000);
} else if (streq(rvalue, "identity")) {
/* identity: User namespacing on, UID range is 0:65536 */
settings->userns_mode = USER_NAMESPACE_FIXED;
settings->uid_shift = 0;
settings->uid_range = UINT32_C(0x10000);
} else {
const char *range, *shift;
uid_t sh, rn;
src/nspawn/nspawn.c
+7 -3
View File
@@ -359,12 +359,16 @@ static int help(void) {
" --keep-unit Do not register a scope for the machine, reuse\n"
" the service unit nspawn is running in\n\n"
"%3$sUser Namespacing:%4$s\n"
" -U --private-users=pick Run within user namespace, autoselect UID/GID range\n"
" --private-users[=UIDBASE[:NUIDS]]\n"
" --private-users=no Run without user namespacing\n"
" --private-users=yes|pick|identity\n"
" Run within user namespace, autoselect UID/GID range\n"
" --private-users=UIDBASE[:NUIDS]\n"
" Similar, but with user configured UID/GID range\n"
" --private-users-ownership=MODE\n"
" Adjust ('chown') or map ('map') OS tree ownership\n"
" to private UID/GID range\n\n"
" to private UID/GID range\n"
" -U Equivalent to --private-users=pick and\n"
" --private-users-ownership=auto\n\n"
"%3$sNetworking:%4$s\n"
" --private-network Disable network in container\n"
" --network-interface=INTERFACE\n"