Remove the hard-coded /usr/share/openvswitch/scripts/ and fetch the path from @pkgdatadir@.
Signed-off-by: William Tu <[email protected]> --- utilities/bugtool/ovs-bugtool.in | 3 ++- .../bugtool/plugins/network-status/openvswitch.xml | 30 +++++++++++----------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in index aa4b567..08d1b76 100755 --- a/utilities/bugtool/ovs-bugtool.in +++ b/utilities/bugtool/ovs-bugtool.in @@ -934,7 +934,8 @@ def load_plugins(just_capabilities=False, filter=None): label = el.getAttribute("label") if label == '': label = None binary = getBoolAttr(el, 'binary') - cmd_output(dir, getText(el.childNodes), label, binary=binary) + script_path = "@pkgdatadir@/scripts/" + getText(el.childNodes) + cmd_output(dir, script_path, label, binary=binary) def make_tar(subdir, suffix, output_fd, output_file): global SILENT_MODE, data diff --git a/utilities/bugtool/plugins/network-status/openvswitch.xml b/utilities/bugtool/plugins/network-status/openvswitch.xml index bb6792a..d29a1d6 100644 --- a/utilities/bugtool/plugins/network-status/openvswitch.xml +++ b/utilities/bugtool/plugins/network-status/openvswitch.xml @@ -17,19 +17,19 @@ --> <collect> - <command label="tc-class-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-tc-class-show</command> - <command label="ovs-vsctl-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-vsctl-show</command> - <command label="dump-ovsdb" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovsdb-dump</command> - <command label="ovs-appctl-fdb-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-fdb-show</command> - <command label="ovs-appctl-lacp-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-lacp-show</command> - <command label="ovs-appctl-cfm-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-cfm-show</command> - <command label="ovs-appctl-bfd-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-bfd-show</command> - <command label="ovs-appctl-conntrack-dump" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-conntrack-dump</command> - <command label="ovs-appctl-coverage-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-coverage-show</command> - <command label="ovs-appctl-bond-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-bond-show</command> - <command label="ovs-appctl-memory-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-memory-show</command> - <command label="ovs-ofctl-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovs-ofctl-show</command> - <command label="ovs-ofctl-dump-flows" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovs-ofctl-dump-flows</command> - <command label="ovs-appctl-dpif" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovs-appctl-dpif</command> - <command label="ovs-appctl-list-dbs" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-list-dbs</command> + <command label="tc-class-show" filters="ovs">ovs-bugtool-tc-class-show</command> + <command label="ovs-vsctl-show" filters="ovs">ovs-bugtool-vsctl-show</command> + <command label="dump-ovsdb" filters="ovs">ovs-bugtool-ovsdb-dump</command> + <command label="ovs-appctl-fdb-show" filters="ovs">ovs-bugtool-fdb-show</command> + <command label="ovs-appctl-lacp-show" filters="ovs">ovs-bugtool-lacp-show</command> + <command label="ovs-appctl-cfm-show" filters="ovs">ovs-bugtool-cfm-show</command> + <command label="ovs-appctl-bfd-show" filters="ovs">ovs-bugtool-bfd-show</command> + <command label="ovs-appctl-conntrack-dump" filters="ovs">ovs-bugtool-conntrack-dump</command> + <command label="ovs-appctl-coverage-show" filters="ovs">ovs-bugtool-coverage-show</command> + <command label="ovs-appctl-bond-show" filters="ovs">ovs-bugtool-bond-show</command> + <command label="ovs-appctl-memory-show" filters="ovs">ovs-bugtool-memory-show</command> + <command label="ovs-ofctl-show" filters="ovs">ovs-bugtool-ovs-ofctl-show</command> + <command label="ovs-ofctl-dump-flows" filters="ovs">ovs-bugtool-ovs-ofctl-dump-flows</command> + <command label="ovs-appctl-dpif" filters="ovs">ovs-bugtool-ovs-appctl-dpif</command> + <command label="ovs-appctl-list-dbs" filters="ovs">ovs-bugtool-list-dbs</command> </collect> -- 2.5.0 _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
