[Ovirt-devel] [PATCH node] drop collectd startup reordering hack
Alan Pevec
apevec at redhat.com
Wed Aug 12 10:20:53 UTC 2009
collectd-virt reconnect is fixed in collectd-4.5.4-2.fc11
Signed-off-by: Alan Pevec <apevec at redhat.com>
---
Makefile.am | 1 -
ovirt-node.spec.in | 10 ----------
scripts/collectd | 1 -
3 files changed, 0 insertions(+), 12 deletions(-)
delete mode 100644 scripts/collectd
diff --git a/Makefile.am b/Makefile.am
index 0374f07..419cdf1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,6 @@ EXTRA_DIST = \
ovirt-node-selinux.fc \
images/grub-splash.xpm.gz \
images/syslinux-vesa-splash.jpg \
- scripts/collectd \
scripts/collectd.conf.in \
scripts/ovirt \
scripts/ovirt-awake \
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index d88a5b2..12815c9 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -175,7 +175,6 @@ cd -
%{__install} -p -m0755 scripts/ovirt %{buildroot}%{_initrddir}
%{__install} -p -m0755 scripts/ovirt-post %{buildroot}%{_initrddir}
-%{__install} -p -m0644 scripts/collectd %{buildroot}%{_sysconfdir}/chkconfig.d
%{__install} -p -m0644 scripts/collectd.conf.in %{buildroot}%{_sysconfdir}
%{__install} -p -m0755 kinit/ovirt-kinit %{buildroot}%{_sysconfdir}/cron.hourly
@@ -243,9 +242,6 @@ sed '/<Plugin network>/,/<\/Plugin>/d' /etc/collectd.conf.in > /etc/collectd.con
/sbin/chkconfig --add ovirt-firstboot
/sbin/chkconfig --add ovirt
/sbin/chkconfig --add ovirt-post
-# this is ugly; we need collectd to start *after* libvirtd, so we own the
-# /etc/chkconfig.d/collectd file, and then have to re-define collectd here
-/sbin/chkconfig --add collectd
%preun stateless
if [ "$1" = 0 ] ; then
@@ -255,11 +251,6 @@ if [ "$1" = 0 ] ; then
/sbin/chkconfig --del ovirt-post
fi
-%post stateful
-/sbin/chkconfig --add collectd
-
-%preun stateful
-
%post selinux
for selinuxvariant in %{selinux_variants}; do
/usr/sbin/semodule -s ${selinuxvariant} -i \
@@ -335,7 +326,6 @@ fi
%{_initrddir}/ovirt-functions
%defattr(-,root,root,0644)
%{_sysconfdir}/collectd.conf.in
-%{_sysconfdir}/chkconfig.d/collectd
%config %attr(0644,root,root) %{_sysconfdir}/ovirt-release
%config %attr(0644,root,root) %{_sysconfdir}/default/ovirt
diff --git a/scripts/collectd b/scripts/collectd
deleted file mode 100644
index 3990cfe..0000000
--- a/scripts/collectd
+++ /dev/null
@@ -1 +0,0 @@
-# chkconfig: 345 98 02
--
1.6.0.6
More information about the ovirt-devel
mailing list