ofp-actions: Support mixing "conjunction" and "note" actions.

[cascardo/ovs.git] / utilities / ovs-lib.in

diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
index 029ed3b..acfaa4d 100644 (file)
--- a/utilities/ovs-lib.in
+++ b/utilities/ovs-lib.in
@@ -54,7 +54,11 @@ ovs_ctl () {
             # 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"
+            if test -w "${logdir}/ovs-ctl.log"; then
+                 echo "${display}" | tee -a "${logdir}/ovs-ctl.log"
+            else
+                 echo "${display}"
+            fi
             return ${rc}
         ;;
         *)
@@ -124,6 +128,10 @@ pid_exists () {
     test -d /proc/"$1"
 }
 
+pid_comm_check () {
+    [ "$1" = "`cat /proc/$2/comm`" ]
+}
+
 start_daemon () {
     priority=$1
     wrapper=$2
@@ -240,5 +248,5 @@ daemon_status () {
 
 daemon_is_running () {
     pidfile=$rundir/$1.pid
-    test -e "$pidfile" && pid=`cat "$pidfile"` && pid_exists "$pid"
+    test -e "$pidfile" && pid=`cat "$pidfile"` && pid_exists "$pid" && pid_comm_check $1 $pid
 } >/dev/null 2>&1