client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 33 ++++++++------
monitoring/spacewalk-monitoring/Monitoring.service | 2
monitoring/spacewalk-monitoring/MonitoringScout.service | 2
monitoring/spacewalk-monitoring/spacewalk-monitoring.spec | 22 ++++++---
rel-eng/packages/spacewalk-monitoring | 2
5 files changed, 42 insertions(+), 19 deletions(-)
New commits:
commit d87a448790538585e93709054cf9ba23a2db3876
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 26 11:47:23 2013 +0100
Automatic commit of package [spacewalk-monitoring] release [1.9.4-1].
diff --git a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
index 95bf31c..b3665af 100644
--- a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
+++ b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
@@ -1,7 +1,7 @@
Summary: Spacewalk monitoring
Name: spacewalk-monitoring
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.9.3
+Version: 1.9.4
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
License: GPLv2
@@ -139,6 +139,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Tue Feb 26 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.4-1
+- corrected monitoring service type
+- enable monitoring services in systemd by default
+
* Wed Feb 13 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.3-1
- fixing rpm build failure
diff --git a/rel-eng/packages/spacewalk-monitoring
b/rel-eng/packages/spacewalk-monitoring
index faa7fd4..47f07ec 100644
--- a/rel-eng/packages/spacewalk-monitoring
+++ b/rel-eng/packages/spacewalk-monitoring
@@ -1 +1 @@
-1.9.3-1 monitoring/spacewalk-monitoring/
+1.9.4-1 monitoring/spacewalk-monitoring/
commit 1a8872b85d012ea3b494622ef066671b0c766bbc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 26 11:42:10 2013 +0100
corrected monitoring service type
fixing service status reporting under systemctl
systemctl status Monitoring
Monitoring.service - Spacewalk Monitoring service
Loaded: loaded (/usr/lib/systemd/system/Monitoring.service; enabled)
Active: inactive (dead) since Tue 2013-02-26 05:36:39 EST; 8s ago
diff --git a/monitoring/spacewalk-monitoring/Monitoring.service
b/monitoring/spacewalk-monitoring/Monitoring.service
index e08e66b..c8d13f4 100644
--- a/monitoring/spacewalk-monitoring/Monitoring.service
+++ b/monitoring/spacewalk-monitoring/Monitoring.service
@@ -5,6 +5,8 @@ After=syslog.target network.target
[Service]
ExecStart=/usr/sbin/Monitoring start
ExecStop=/usr/sbin/Monitoring stop
+Type=oneshot
+RemainAfterExit=yes
[Install]
WantedBy=multi-user.target
diff --git a/monitoring/spacewalk-monitoring/MonitoringScout.service
b/monitoring/spacewalk-monitoring/MonitoringScout.service
index 012c3e9..cfa49c0 100644
--- a/monitoring/spacewalk-monitoring/MonitoringScout.service
+++ b/monitoring/spacewalk-monitoring/MonitoringScout.service
@@ -5,6 +5,8 @@ After=syslog.target network.target
[Service]
ExecStart=/usr/sbin/MonitoringScout start
ExecStop=/usr/sbin/MonitoringScout stop
+Type=oneshot
+RemainAfterExit=yes
[Install]
WantedBy=multi-user.target
commit 53074447864e69bef60e4e66a6b4f2fefeb58088
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 26 10:16:11 2013 +0100
enable monitoring services in systemd by default
diff --git a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
index b568a09..95bf31c 100644
--- a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
+++ b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
@@ -49,7 +49,7 @@ Requires: tsdb
Requires: spacewalk-monitoring-selinux
%if 0%{?fedora}
-Requires(preun): systemd
+%systemd_requires
%else
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -100,6 +100,12 @@ fi
if [ -x /etc/init.d/MonitoringScout ] ; then
/sbin/chkconfig --add MonitoringScout
fi
+if [ -r %{_unitdir}/Monitoring.service ] ; then
+ /usr/bin/systemctl enable Monitoring.service
+fi
+if [ -r %{_unitdir}/MonitoringScout.service ] ; then
+ /usr/bin/systemctl enable MonitoringScout.service
+fi
%preun
if [ $1 = 0 ] ; then
@@ -111,11 +117,11 @@ if [ $1 = 0 ] ; then
/sbin/service Monitoring stop >/dev/null 2>&1
/sbin/chkconfig --del Monitoring
fi
- if [ -f %{_unitdir}/MonitoringScout ] ; then
- /usr/bin/systemctl stop MonitoringScout
+ if [ -f %{_unitdir}/MonitoringScout.service ] ; then
+ %systemd_preun MonitoringScout.service
fi
- if [ -f %{_unitdir}/Monitoring ] ; then
- /usr/bin/systemctl stop Monitoring
+ if [ -f %{_unitdir}/Monitoring.service ] ; then
+ %systemd_preun Monitoring.service
fi
fi
commit 529a11006a8c2424333bfe471fd71883c90231e0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 26 09:44:15 2013 +0100
let's enable & start rhnsd properly in systemd
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
index fbdb0d9..a17b3d9 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
@@ -50,19 +50,28 @@ log = up2dateLog.initLog()
def startRhnsd():
# successful registration. Try to start rhnsd if it isn't running.
if os.access("/usr/sbin/rhnsd", os.R_OK|os.X_OK):
- if os.access("/sbin/chkconfig", os.R_OK|os.X_OK):
- os.system("/sbin/chkconfig rhnsd on > /dev/null");
+ if os.access("/usr/lib/systemd/system/rhnsd.service", os.R_OK):
+ # systemd
+ if os.access("/usr/bin/systemctl", os.R_OK|os.X_OK):
+ os.system("/usr/bin/systemctl enable rhnsd > /dev/null");
+ os.system("/usr/bin/systemctl start rhnsd > /dev/null");
+ else:
+ print _("Warning: unable to enable rhnsd with systemd")
else:
- print _("Warning: unable to enable rhnsd with chkconfig")
-
- service_path = "/sbin/service"
- if not os.access(service_path, os.R_OK|os.X_OK):
- if os.access("/usr/sbin/service", os.R_OK|os.X_OK):
- service_path = "/usr/sbin/service"
-
- rc = os.system("%s rhnsd status > /dev/null" % service_path)
- if rc:
- os.system("%s rhnsd start > /dev/null" % service_path)
+ # SysV init scripts
+ if os.access("/sbin/chkconfig", os.R_OK|os.X_OK):
+ os.system("/sbin/chkconfig rhnsd on > /dev/null");
+ else:
+ print _("Warning: unable to enable rhnsd with chkconfig")
+
+ service_path = "/sbin/service"
+ if not os.access(service_path, os.R_OK|os.X_OK):
+ if os.access("/usr/sbin/service", os.R_OK|os.X_OK):
+ service_path = "/usr/sbin/service"
+
+ rc = os.system("%s rhnsd status > /dev/null" % service_path)
+ if rc:
+ os.system("%s rhnsd start > /dev/null" % service_path)
def getOemInfo():
configFile = cfg["oemInfoFile"] or "/etc/sysconfig/rhn/oeminfo"