Patchwork [iproute2,v2] ipnetns: fix ip batch mode when using 'netns exec'

login
register
mail settings
Submitter Nicolas Dichtel
Date Aug. 29, 2013, 12:29 p.m.
Message ID <1377779347-7077-1-git-send-email-nicolas.dichtel@6wind.com>
Download mbox | patch
Permalink /patch/270801/
State Accepted
Delegated to: stephen hemminger
Headers show

Comments

Nicolas Dichtel - Aug. 29, 2013, 12:29 p.m.
Since commit a05f6511f543, ip batch mode is broken when using 'netns exec' cmd.

When WIFEXITED() returns true, it means that the child exited normally, hence
we must not call exit() but just returns the status. If we call exit, the next
commands in the file file are not executed.
If WIFEXITED() returns false, we can call exit() because it means that the
child failed.

This patch partially reverts commit a05f6511f543.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---

v2: fix a typo in a comment

 ip/ipnetns.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Patch

diff --git a/ip/ipnetns.c b/ip/ipnetns.c
index c8a47920539c..89dda3ffd138 100644
--- a/ip/ipnetns.c
+++ b/ip/ipnetns.c
@@ -205,11 +205,15 @@  static int netns_exec(int argc, char **argv)
 				exit(1);
 			}
 
-			/* If child failed, propagate status */
-			if (WIFEXITED(status))
-				exit(WEXITSTATUS(status));
+			if (WIFEXITED(status)) {
+				/* ip must return the status of the child,
+				 * but do_cmd() will add a minus to this,
+				 * so let's add another one here to cancel it.
+				 */
+				return -WEXITSTATUS(status);
+			}
 
-			return 0;
+			exit(1);
 		}
 	}