diff options
| author | Chris Wright <chrisw@sous-sol.org> | 2011-12-08 23:36:06 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-12-09 09:42:34 -0800 |
| commit | 3585b93de2d565e51a35c281a3e59a686b706c5d (patch) | |
| tree | 1852b27255eaa2d76f201cdfec5a4103d5c70078 /utilities | |
| parent | 97b46c2a7ef7b4179238c51885f9d36d16709753 (diff) | |
bugtool: move plugins data from /etc/openvswitch to /usr/share/openvswitch
This is in repsonse to the following rpmlint warnings:
W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/system-configuration/openvswitch.xml
W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/system-logs/openvswitch.xml
W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/system-configuration.xml
W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/network-status/openvswitch.xml
W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/kernel-info/openvswitch.xml
The xenserver specfile still places them in /etc/xensource/bugtool since
that's a distro policy. Of course, the rpmlint warnings are as well,
however, this seems like a more logical place for the bugtool plugins.
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'utilities')
| -rw-r--r-- | utilities/bugtool/automake.mk | 2 | ||||
| -rwxr-xr-x | utilities/bugtool/ovs-bugtool.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk index 63762f13..9e625cee 100644 --- a/utilities/bugtool/automake.mk +++ b/utilities/bugtool/automake.mk @@ -18,7 +18,7 @@ bugtool_scripts = \ utilities/bugtool/ovs-bugtool-ovsdb-dump scripts_SCRIPTS += $(bugtool_scripts) -bugtoolpluginsdir = $(sysconfdir)/openvswitch/bugtool-plugins +bugtoolpluginsdir = $(pkgdatadir)/bugtool-plugins INSTALL_DATA_LOCAL += bugtool-install-data-local bugtool-install-data-local: for plugin in $(bugtool_plugins); do \ diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in index 6a4316af..f78289de 100755 --- a/utilities/bugtool/ovs-bugtool.in +++ b/utilities/bugtool/ovs-bugtool.in @@ -67,7 +67,7 @@ OS_RELEASE = platform.release() APT_SOURCES_LIST = "/etc/apt/sources.list" APT_SOURCES_LIST_D = "/etc/apt/sources.list.d" BUG_DIR = "/var/log/ovs-bugtool" -PLUGIN_DIR = "@sysconfdir@/openvswitch/bugtool-plugins" +PLUGIN_DIR = "@pkgdatadir@/bugtool-plugins" GRUB_CONFIG = '/boot/grub/menu.lst' BOOT_KERNEL = '/boot/vmlinuz-' + OS_RELEASE BOOT_INITRD = '/boot/initrd-' + OS_RELEASE + '.img' |