From d422c1189901d34125cd2d46552391c333d1f647 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 8 Dec 2011 23:36:05 -0800 Subject: [PATCH] utilites: rename ovs-lib.sh to ovs-lib Rename this helper script to simply ovs-lib, since it's primarily a library of helper functions. Signed-off-by: Chris Wright Signed-off-by: Ben Pfaff --- debian/openvswitch-switch.init | 2 +- debian/openvswitch-switch.install | 2 +- rhel/etc_init.d_openvswitch | 2 +- rhel/openvswitch.spec.in | 2 +- utilities/.gitignore | 2 +- utilities/automake.mk | 6 +++--- utilities/ovs-ctl.in | 2 +- utilities/{ovs-lib.sh.in => ovs-lib.in} | 0 xenserver/etc_init.d_openvswitch | 2 +- xenserver/openvswitch-xen.spec | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) rename utilities/{ovs-lib.sh.in => ovs-lib.in} (100%) diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init index 3d187a05..6f08c3fa 100755 --- a/debian/openvswitch-switch.init +++ b/debian/openvswitch-switch.init @@ -25,7 +25,7 @@ (test -x /usr/sbin/ovs-vswitchd && test -x /usr/sbin/ovsdb-server) || exit 0 -. /usr/share/openvswitch/scripts/ovs-lib.sh +. /usr/share/openvswitch/scripts/ovs-lib test -e /etc/default/openvswitch-switch && . /etc/default/openvswitch-switch if test X"$BRCOMPAT" = Xyes && test ! -x /usr/sbin/ovs-brcompatd; then diff --git a/debian/openvswitch-switch.install b/debian/openvswitch-switch.install index 308c382a..a7006ac0 100644 --- a/debian/openvswitch-switch.install +++ b/debian/openvswitch-switch.install @@ -7,6 +7,6 @@ usr/bin/ovsdb-tool usr/sbin/ovs-vswitchd usr/sbin/ovsdb-server usr/share/openvswitch/scripts/ovs-ctl -usr/share/openvswitch/scripts/ovs-lib.sh +usr/share/openvswitch/scripts/ovs-lib usr/share/openvswitch/scripts/ovs-save usr/share/openvswitch/vswitch.ovsschema diff --git a/rhel/etc_init.d_openvswitch b/rhel/etc_init.d_openvswitch index f1a34c7a..9f1506c3 100755 --- a/rhel/etc_init.d_openvswitch +++ b/rhel/etc_init.d_openvswitch @@ -27,7 +27,7 @@ # Short-Description: Open vSwitch switch ### END INIT INFO -. /usr/share/openvswitch/scripts/ovs-lib.sh || exit 1 +. /usr/share/openvswitch/scripts/ovs-lib || exit 1 test -e /etc/sysconfig/openvswitch && . /etc/sysconfig/openvswitch start () { diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in index 4d52d3b7..3d6cda3b 100644 --- a/rhel/openvswitch.spec.in +++ b/rhel/openvswitch.spec.in @@ -147,7 +147,7 @@ exit 0 /usr/share/openvswitch/python/ /usr/share/openvswitch/scripts/ovs-bugtool-* /usr/share/openvswitch/scripts/ovs-ctl -/usr/share/openvswitch/scripts/ovs-lib.sh +/usr/share/openvswitch/scripts/ovs-lib /usr/share/openvswitch/scripts/ovs-save /usr/share/openvswitch/scripts/sysconfig.template /usr/share/openvswitch/vswitch.ovsschema diff --git a/utilities/.gitignore b/utilities/.gitignore index ecc4d5f1..d9d4419a 100644 --- a/utilities/.gitignore +++ b/utilities/.gitignore @@ -12,7 +12,7 @@ /ovs-ctl /ovs-dpctl /ovs-dpctl.8 -/ovs-lib.sh +/ovs-lib /ovs-ofctl /ovs-ofctl.8 /ovs-parse-leaks diff --git a/utilities/automake.mk b/utilities/automake.mk index 1c8a56b9..89078cb8 100644 --- a/utilities/automake.mk +++ b/utilities/automake.mk @@ -14,11 +14,11 @@ bin_SCRIPTS += \ endif noinst_SCRIPTS += utilities/ovs-pki-cgi scripts_SCRIPTS += utilities/ovs-ctl utilities/ovs-save -scripts_DATA += utilities/ovs-lib.sh +scripts_DATA += utilities/ovs-lib EXTRA_DIST += \ utilities/ovs-ctl.in \ - utilities/ovs-lib.sh.in \ + utilities/ovs-lib.in \ utilities/ovs-parse-leaks.in \ utilities/ovs-pcap.in \ utilities/ovs-pki-cgi.in \ @@ -49,7 +49,7 @@ DISTCLEANFILES += \ utilities/ovs-benchmark.1 \ utilities/ovs-controller.8 \ utilities/ovs-dpctl.8 \ - utilities/ovs-lib.sh \ + utilities/ovs-lib \ utilities/ovs-ofctl.8 \ utilities/ovs-parse-leaks \ utilities/ovs-pcap \ diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in index 8788e4a3..ee6035c0 100755 --- a/utilities/ovs-ctl.in +++ b/utilities/ovs-ctl.in @@ -17,7 +17,7 @@ case $0 in */*) dir0=`echo "$0" | sed 's,/[^/]*$,,'` ;; *) dir0=./ ;; esac -. "$dir0/ovs-lib.sh" || exit 1 +. "$dir0/ovs-lib" || exit 1 for dir in "$sbindir" "$bindir" /sbin /bin /usr/sbin /usr/bin; do case :$PATH: in diff --git a/utilities/ovs-lib.sh.in b/utilities/ovs-lib.in similarity index 100% rename from utilities/ovs-lib.sh.in rename to utilities/ovs-lib.in diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch index 8ba8aeeb..c7d0736a 100755 --- a/xenserver/etc_init.d_openvswitch +++ b/xenserver/etc_init.d_openvswitch @@ -27,7 +27,7 @@ # Short-Description: Open vSwitch switch ### END INIT INFO -. /usr/share/openvswitch/scripts/ovs-lib.sh || exit 1 +. /usr/share/openvswitch/scripts/ovs-lib || exit 1 . /etc/xensource-inventory test -e /etc/sysconfig/openvswitch && . /etc/sysconfig/openvswitch diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index a53fcc73..4dbc71b1 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -337,7 +337,7 @@ exit 0 /usr/share/openvswitch/scripts/ovs-bugtool-* /usr/share/openvswitch/scripts/ovs-save /usr/share/openvswitch/scripts/ovs-ctl -/usr/share/openvswitch/scripts/ovs-lib.sh +/usr/share/openvswitch/scripts/ovs-lib /usr/share/openvswitch/vswitch.ovsschema /usr/sbin/ovs-vlan-bug-workaround /usr/sbin/ovs-vswitchd -- 2.30.2