- rel 2; --daemon option is gone in upstream

diff --git a/fedmsg-hub.init b/fedmsg-hub.init
index 42042fcaa414c383608c5c205959210c4f723b51..6ef35e3cb17ac120490366b372bf97cf05cfec10 100755 (executable)
--- a/fedmsg-hub.init
+++ b/fedmsg-hub.init
@@ -27,7 +27,7 @@ fi
 # Set defaults
 PROG=fedmsg-hub
 USER=fedmsg
-OPTIONS=--daemon
+OPTIONS=
 PIDFILE=/var/run/fedmsg/$PROG.pid
 
 # Get service config - may override defaults
@@ -41,7 +41,7 @@ start() {
        fi
 
        msg_starting "FedMsg Hub"
-       daemon --user $USER $PROG $OPTIONS
+       daemon --user $USER --fork $PROG $OPTIONS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/fedmsg-hub
 }

diff --git a/fedmsg.spec b/fedmsg.spec
index dce3e0b331b598a9311d9d10338f615269a0c213..02d364003d3582a88cda9a88bd69e05825f10081 100644 (file)
--- a/fedmsg.spec
+++ b/fedmsg.spec
@@ -1,6 +1,3 @@
-# TODO
-# - --daemonize crashes (works under systemd only): https://github.com/fedora-infra/fedmsg/issues/302
-
 # Conditional build:
 %bcond_with    tests           # build with tests
 
@@ -10,7 +7,7 @@
 Summary:       Tools for Fedora Infrastructure real-time messaging
 Name:          fedmsg
 Version:       1.1.1
-Release:       1
+Release:       2
 License:       LGPL v2+
 Group:         Applications/Networking
 Source0:       https://files.pythonhosted.org/packages/source/f/%{pypi_name}/%{pypi_name}-%{version}.tar.gz