commit ac647687b5d8c7bfb01cd7fc24ef36c23b10cc23
Author: Jacek Konieczny <[email protected]>
Date: Mon Oct 29 16:22:10 2012 +0100
make sysconfig/corosync-notifyd usable for systemd
The sysconfig file used by our init script would not be usable for
the sytemd unit got upstream.
Release: 3
corosync-notifyd.init | 19 ++-----------------
corosync-notifyd.sysconfig | 13 ++-----------
corosync.spec | 2 +-
3 files changed, 5 insertions(+), 29 deletions(-)
---
diff --git a/corosync.spec b/corosync.spec
index 579a823..bb649b8 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -13,7 +13,7 @@ Summary: Corosync - OSI Certified implementation of a
complete cluster engine
Summary(pl.UTF-8): Corosync - implementacja silnika klastrowego
certyfikowana przez OSI
Name: corosync
Version: 2.1.0
-Release: 2
+Release: 3
License: BSD
Group: Base
Source0:
https://github.com/downloads/corosync/corosync/corosync-2.1.0.tar.gz
diff --git a/corosync-notifyd.init b/corosync-notifyd.init
index c897d80..0397d7b 100644
--- a/corosync-notifyd.init
+++ b/corosync-notifyd.init
@@ -19,9 +19,7 @@
# Source function library
. /etc/rc.d/init.d/functions
-SEND_SNMP_TRAPS=no
-SEND_DBUS_SIGNALS=yes
-LOG_ALL_EVENTS=no
+OPTIONS="-d"
[ -f /etc/sysconfig/corosync-notifyd ] && . /etc/sysconfig/corosync-notifyd
@@ -37,21 +35,8 @@ start() {
return
fi
- local options=""
- if is_yes "$SEND_SNMP_TRAPS" ; then
- options="$options -s"
- fi
- if [ -n "$SNMP_MANAGER" ] ; then
- options="$options -m $SNMP_MANAGER"
- fi
- if is_yes "$SEND_DBUS_SIGNALS" ; then
- options="$options -d"
- fi
- if is_yes "$LOG_ALL_EVENTS" ; then
- options="$options -l"
- fi
msg_starting "Corosync Notifier"
- daemon /usr/sbin/corosync-notifyd "$options"
+ daemon /usr/sbin/corosync-notifyd "$OPTIONS"
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/corosync-notifyd
}
diff --git a/corosync-notifyd.sysconfig b/corosync-notifyd.sysconfig
index c40c6df..a268cf5 100644
--- a/corosync-notifyd.sysconfig
+++ b/corosync-notifyd.sysconfig
@@ -1,12 +1,3 @@
-# Send SNMP traps on all events.
-SEND_SNMP_TRAPS=no
-
-# SNMP Manager IP address (defaults to localhost).
-#SNMP_MANAGER=
-
-# Send DBUS signals on all events.
-SEND_DBUS_SIGNALS=yes
-
-# Log all events.
-LOG_ALL_EVENTS=no
+# log and signal over DBus all events
+OPTIONS=-l -d
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/corosync.git/commitdiff/ac647687b5d8c7bfb01cd7fc24ef36c23b10cc23
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
