[rwho] Remove sdnotify message, while it doesn't work with forking service

Honza Horak hhorak at fedoraproject.org
Fri Oct 5 06:04:39 UTC 2012


commit 8dbf44c04dd5e2800bc9f73e9dd46c39a72a05ba
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date:   Fri Oct 5 08:04:16 2012 +0200

    Remove sdnotify message, while it doesn't work with forking service

 rwho-0.17-sdnotify.patch |   38 --------------------------------------
 rwho.spec                |    7 ++++---
 rwhod.service            |    3 +--
 3 files changed, 5 insertions(+), 43 deletions(-)
---
diff --git a/rwho.spec b/rwho.spec
index 758efa9..143999b 100644
--- a/rwho.spec
+++ b/rwho.spec
@@ -1,7 +1,7 @@
 Summary: Displays who is logged in to local network machines
 Name: rwho
 Version: 0.17
-Release: 44%{?dist}
+Release: 45%{?dist}
 # part of rwhod is under GPL+, other parts are under BSD
 License: BSD and GPL+
 Group: System Environment/Daemons
@@ -19,7 +19,6 @@ Patch8: rwho-0.17-gcc4.patch
 Patch9: rwho-0.17-waitchild.patch
 Patch10: rwho-0.17-neighbours.patch
 Patch11: rwho-0.17-hostnamelen.patch
-Patch12: rwho-0.17-sdnotify.patch
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -49,7 +48,6 @@ are logged in to your local network.
 %patch9 -p1 -b .waitchild
 %patch10 -p1 -b .neighbours
 %patch11 -p1 -b .hostnamelen
-%patch12 -p1 -b .sdnotify
 
 %build
 sh configure --with-c-compiler=gcc
@@ -117,6 +115,9 @@ install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_unitdir}/rwhod.service
 %{_unitdir}/*
 
 %changelog
+* Thu Oct 05 2012 Honza Horak <hhorak at redhat.com> - 0.17-45
+- Remove sdnotify message, while it doesn't work with forking service
+
 * Thu Oct 04 2012 Honza Horak <hhorak at redhat.com> - 0.17-44
 - Use sdnotify message to inform systemd the daemon is ready
 
diff --git a/rwhod.service b/rwhod.service
index 2fc6c58..d5e166e 100644
--- a/rwhod.service
+++ b/rwhod.service
@@ -3,8 +3,7 @@ Description=Remote Machine Logged In User Lister
 Requires=syslog.target network.target
 
 [Service]
-Type=notify
-NotifyAccess=all
+Type=forking
 ExecStart=/usr/sbin/rwhod
 StandardError=syslog
 


More information about the scm-commits mailing list