Page MenuHomeClusterLabs Projects

No OneTemporary

diff --git a/src/sbd.service.in b/src/sbd.service.in
index cd5a89d..8649c05 100644
--- a/src/sbd.service.in
+++ b/src/sbd.service.in
@@ -1,25 +1,25 @@
[Unit]
Description=Shared-storage based fencing daemon
Before=pacemaker.service corosync.service
After=systemd-modules-load.service iscsi.service
PartOf=corosync.service
RefuseManualStop=true
RefuseManualStart=true
[Service]
Type=forking
+PIDFile=@localstatedir@/run/sbd.pid
EnvironmentFile=-@sysconfdir@/sysconfig/sbd
-ExecStart=@sbindir@/sbd $SBD_OPTS watch
+ExecStart=@sbindir@/sbd $SBD_OPTS -p @localstatedir@/run/sbd.pid watch
ExecStop=@bindir@/kill -TERM $MAINPID
-PIDFile=${SBD_PIDFILE}
# Could this benefit from exit codes for restart?
# Does this need to be set to msgwait * 1.2?
# TimeoutSec=
# If SBD crashes, it'll very likely suicide immediately due to the
# hardware watchdog. But one can always try.
Restart=on-abort
[Install]
RequiredBy=corosync.service
diff --git a/src/sbd.sysconfig b/src/sbd.sysconfig
index e97613a..9ac2d15 100644
--- a/src/sbd.sysconfig
+++ b/src/sbd.sysconfig
@@ -1,58 +1,51 @@
## Type: string
## Default: ""
#
# SBD_DEVICE specifies the devices to use for exchanging sbd messages
# and to monitor. If specifying more than one path, use ";" as
# separator.
#
#SBD_DEVICE=""
## Type: yesno
## Default: yes
#
# Whether to enable the pacemaker integration.
#
SBD_PACEMAKER=yes
## Type: list(always,clean)
## Default: always
#
# Specify the start mode for sbd. Setting this to "clean" will only
# allow sbd to start if it was not previously fenced. See the -S option
# in the man page.
#
SBD_STARTMODE=clean
## Type: yesno
## Default: no
#
# Whether to delay after starting sbd on boot for "msgwait" seconds.
# This may be necessary if your cluster nodes reboot so fast that the
# other nodes are still waiting in the fence acknowledgement phase.
# This is an occasional issue with virtual machines.
#
# This option may be ignored at a later point, once pacemaker handles
# this case better.
#
SBD_DELAY_START=no
## Type: yesno
## Default: yes
#
# Whether to use a watchdog.
#
SBD_WATCHDOG_DEV=/dev/watchdog
-## Type: string
-## Default: /var/run/sbd.pid
-#
-# Where to store the PID of the active process
-#
-SBD_PIDFILE=/var/run/sbd.pid
-
## Type: string
## Default: ""
#
# Additional options for starting sbd
#
SBD_OPTS=

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jul 10, 3:21 AM (17 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2009911
Default Alt Text
(2 KB)

Event Timeline