[ovs-dev] [PATCH ovn 04/19] ovn-ctl: Change the order of ovn-lib and ovs-lib.
Han Zhou
hzhou at ovn.org
Mon Oct 21 00:51:04 UTC 2019
Some function names are identical in both libs, e.g. daemon_is_running().
Currently we included ovs-lib after ovn-lib, so the one in ovs-lib
overrides the one in ovn-lib, which results in unexpected behavior.
This patch changes the order so that functions in ovn-lib will take
effect when there is confict names.
Signed-off-by: Han Zhou <hzhou at ovn.org>
---
utilities/ovn-ctl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utilities/ovn-ctl b/utilities/ovn-ctl
index 481e28f..576a983 100755
--- a/utilities/ovn-ctl
+++ b/utilities/ovn-ctl
@@ -19,8 +19,8 @@ case $0 in
;;
*) dir0=./ ;;
esac
-. "$dir0/ovn-lib" || exit 1
. "$ovsdir/ovs-lib" || exit 1
+. "$dir0/ovn-lib" || exit 1
for dir in "$sbindir" "$ovn_bindir" "$bindir" /sbin /bin /usr/sbin /usr/bin; do
case :$PATH: in
--
2.1.0
More information about the dev
mailing list