From 1e7bc050ea69b53ece1d5cdacbcdbc46a0a42a8c Mon Sep 17 00:00:00 2001 From: Gurucharan Shetty Date: Mon, 7 Oct 2013 14:28:48 -0700 Subject: [PATCH] ovs-lib: Return the correct exit status of the command 'status' commit 46528f78e5c(debian, rhel, xenserver: Ability to collect ovs-ctl logs) made changes in the startup scripts such that the o/p of ovs-ctl is logged into ovs-ctl.log. But it had an unintended consequence that the exit status of ovs-ctl was no longer returned. We would always return success(the exit status of tee). With this commit, we return the exit status of ovs-ctl instead of tee. Signed-off-by: Gurucharan Shetty Acked-by: Ben Pfaff --- utilities/ovs-lib.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in index 1684ddcdd..029ed3bf5 100644 --- a/utilities/ovs-lib.in +++ b/utilities/ovs-lib.in @@ -49,6 +49,14 @@ ovs_ctl () { # pipe). So, do not log the o/p to ovs-ctl.log. "${datadir}/scripts/ovs-ctl" "$@" ;; + "status") + # In case of the command 'status', we should return the exit status + # of ovs-ctl. It is also useful to document the o/p in ovs-ctl.log. + display=`"${datadir}/scripts/ovs-ctl" "$@" 2>&1` + rc=$? + echo "${display}" | tee -a "${logdir}/ovs-ctl.log" + return ${rc} + ;; *) echo "`date -u`:$@" >> "${logdir}/ovs-ctl.log" "${datadir}/scripts/ovs-ctl" "$@" 2>&1 | tee -a "${logdir}/ovs-ctl.log" -- 2.20.1