proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 03:35:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2078 from tych0/usernsexec-exit-status

Browse Source 
fix up lxc-usernsexec's exit status
This commit is contained in:
Christian Brauner 2018-01-08 17:36:32 +01:00 committed by GitHub
commit 6ddb17ff99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lxc/tools/lxc_usernsexec.c
View File

@ -71,7 +71,6 @@ static void usage(const char *name)
printf(" Note: This program uses newuidmap(2) and newgidmap(2).\n"); printf(" Note: This program uses newuidmap(2) and newgidmap(2).\n");
printf(" As such, /etc/subuid and /etc/subgid must grant the\n"); printf(" As such, /etc/subuid and /etc/subgid must grant the\n");
printf(" calling user permission to use the mapped ranges\n"); printf(" calling user permission to use the mapped ranges\n");
exit(EXIT_SUCCESS);
} }
static void opentty(const char * tty, int which) { static void opentty(const char * tty, int which) {
@ -300,10 +299,18 @@ int main(int argc, char *argv[])
while ((c = getopt(argc, argv, "m:h")) != EOF) { while ((c = getopt(argc, argv, "m:h")) != EOF) {
switch (c) { switch (c) {
case 'm': if (parse_map(optarg)) usage(argv[0]); break; case 'm':
if (parse_map(optarg)) {
usage(argv[0]);
exit(EXIT_FAILURE);
}
break;
case 'h': case 'h':
usage(argv[0]);
exit(EXIT_SUCCESS);
default: default:
usage(argv[0]); usage(argv[0]);
exit(EXIT_FAILURE);
} }
}; };