2017-01-31 17:11:17 +00:00
|
|
|
From 045473ceb4999997f44fd1e4e1a3e5530b6fb828 Mon Sep 17 00:00:00 2001
|
2017-01-29 22:22:41 +00:00
|
|
|
From: Martin Pitt <martin.pitt@ubuntu.com>
|
|
|
|
|
Date: Tue, 8 Nov 2016 05:31:55 +0100
|
|
|
|
|
Subject: [PATCH] nspawn: fix exit code for --help and --version (#4609)
|
|
|
|
|
|
|
|
|
|
Commit b006762 inverted the initial exit code which is relevant for --help and
|
|
|
|
|
--version without a particular reason. For these special options, parse_argv()
|
|
|
|
|
returns 0 so that our main() immediately skips to the end without adjusting
|
|
|
|
|
"ret". Otherwise, if an actual container is being started, ret is set on error
|
|
|
|
|
in run(), which still provides the "non-zero exit on error" behaviour.
|
|
|
|
|
|
|
|
|
|
Fixes #4605.
|
|
|
|
|
(cherry picked from commit cfed63f60dd7412c199652825ed172c319b02b3c)
|
|
|
|
|
---
|
|
|
|
|
src/nspawn/nspawn.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
|
|
|
|
|
index c56af6e6f4..c8fc011907 100644
|
|
|
|
|
--- a/src/nspawn/nspawn.c
|
|
|
|
|
+++ b/src/nspawn/nspawn.c
|
|
|
|
|
@@ -4033,7 +4033,7 @@ int main(int argc, char *argv[]) {
|
|
|
|
|
bool root_device_rw = true, home_device_rw = true, srv_device_rw = true;
|
|
|
|
|
_cleanup_close_ int master = -1, image_fd = -1;
|
|
|
|
|
_cleanup_fdset_free_ FDSet *fds = NULL;
|
|
|
|
|
- int r, n_fd_passed, loop_nr = -1, ret = EXIT_FAILURE;
|
|
|
|
|
+ int r, n_fd_passed, loop_nr = -1, ret = EXIT_SUCCESS;
|
|
|
|
|
char veth_name[IFNAMSIZ] = "";
|
|
|
|
|
bool secondary = false, remove_subvol = false;
|
|
|
|
|
pid_t pid = 0;
|
