Hello community, here is the log from the commit of package resource-agents for openSUSE:Factory checked in at 2015-12-01 10:02:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/resource-agents (Old) and /work/SRC/openSUSE:Factory/.resource-agents.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents" Changes: -------- --- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes 2015-10-17 16:37:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.resource-agents.new/resource-agents.changes 2015-12-01 10:02:42.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Nov 24 22:33:25 UTC 2015 - [email protected] + +- nfsserver: Use rpc-statd.service for NFS locking in EXEC_MODE=3 (bsc#955114) +- Add 0002-nfsserver-Use-rpc-statd.service-for-NFS-locking-in-E.patch + +------------------------------------------------------------------- +Fri Nov 20 10:14:30 UTC 2015 - [email protected] + +- nfsserver: Add EXEC_MODE for systemd without nfs-lock.service (bsc#955114) +- Add 0001-nfsserver-Add-EXEC_MODE-for-systemd-without-nfs-lock.patch + +------------------------------------------------------------------- New: ---- 0001-nfsserver-Add-EXEC_MODE-for-systemd-without-nfs-lock.patch 0002-nfsserver-Use-rpc-statd.service-for-NFS-locking-in-E.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resource-agents.spec ++++++ --- /var/tmp/diff_new_pack.3WVNUC/_old 2015-12-01 10:02:43.000000000 +0100 +++ /var/tmp/diff_new_pack.3WVNUC/_new 2015-12-01 10:02:43.000000000 +0100 @@ -62,6 +62,10 @@ Patch4: no-var-lock-subsys.patch # PATCH-FIX-OPENSUSE: Revert moving binaries to /usr/libexec Patch8: 0006-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch +# PATCH-FIX-UPSTREAM: nfsserver: Add EXEC_MODE for systemd without nfs-lock.service (bsc#955114) +Patch9: 0001-nfsserver-Add-EXEC_MODE-for-systemd-without-nfs-lock.patch +# PATCH-FIX-UPSTREAM: nfsserver: Use rpc-statd.service for NFS locking in EXEC_MODE=3 (bsc#955114) +Patch10: 0002-nfsserver-Use-rpc-statd.service-for-NFS-locking-in-E.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: heartbeat-resources @@ -161,6 +165,8 @@ %patch3 -p1 %patch4 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 ########################################################### %build ++++++ 0001-nfsserver-Add-EXEC_MODE-for-systemd-without-nfs-lock.patch ++++++ >From 20950bf7e173ab57623b3e5d2ddac8ee23abdc34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <[email protected]> Date: Fri, 20 Nov 2015 11:07:00 +0100 Subject: [PATCH] nfsserver: Add EXEC_MODE for systemd without nfs-lock.service (bsc#955114) On SUSE systems, we do not have a nfs-lock.service service script, but we use nfs-server.service to manage NFS using systemd. This patch adds a new EXEC_MODE which uses nfs-server.service to manage the NFS server, but calls rpc.statd to handle NFSv3 locking. --- heartbeat/nfsserver | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver index 6144d0a..6cdde46 100755 --- a/heartbeat/nfsserver +++ b/heartbeat/nfsserver @@ -272,7 +272,8 @@ fi ## # EXEC_MODE values # 1 user init script or default init script -# 2 systemd +# 2 systemd (with nfs-lock.service) +# 3 systemd (without nfs-lock.service) # # On error, this function will terminate the process # with error code $OCF_ERR_INSTALLED @@ -307,7 +308,7 @@ set_exec_mode() fi ## - # Last of all, attempt systemd. + # Attempt systemd (with nfs-lock.service). ## if which systemctl > /dev/null 2>&1; then if systemctl list-unit-files | grep nfs-server > /dev/null && systemctl list-unit-files | grep nfs-lock > /dev/null; then @@ -317,6 +318,16 @@ set_exec_mode() fi fi + ## + # Attempt systemd (without nfs-lock.service). + ## + if which systemctl > /dev/null 2>&1; then + if systemctl list-unit-files | grep nfs-server > /dev/null; then + EXEC_MODE=3 + return 0 + fi + fi + ocf_exit_reason "No init script or systemd unit file detected for nfs server" exit $OCF_ERR_INSTALLED } @@ -332,6 +343,7 @@ nfs_exec() case $EXEC_MODE in 1) ${OCF_RESKEY_nfs_init_script} $cmd;; 2) systemctl $cmd nfs-server.service ;; + 3) systemctl $cmd nfs-server.service ;; esac } -- 2.6.2 ++++++ 0002-nfsserver-Use-rpc-statd.service-for-NFS-locking-in-E.patch ++++++ >From 6b6c491ade52e28e09e3b2c79777a6208ff43a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <[email protected]> Date: Tue, 24 Nov 2015 23:20:41 +0100 Subject: [PATCH] nfsserver: Use rpc-statd.service for NFS locking in EXEC_MODE=3 (bsc#955114) --- heartbeat/nfsserver | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver index 6cdde46..02e5dc3 100755 --- a/heartbeat/nfsserver +++ b/heartbeat/nfsserver @@ -273,7 +273,7 @@ fi # EXEC_MODE values # 1 user init script or default init script # 2 systemd (with nfs-lock.service) -# 3 systemd (without nfs-lock.service) +# 3 systemd (with rpc-statd.service) # # On error, this function will terminate the process # with error code $OCF_ERR_INSTALLED @@ -319,10 +319,10 @@ set_exec_mode() fi ## - # Attempt systemd (without nfs-lock.service). + # Attempt systemd (with rpc-statd.service). ## if which systemctl > /dev/null 2>&1; then - if systemctl list-unit-files | grep nfs-server > /dev/null; then + if systemctl list-unit-files | grep nfs-server > /dev/null && systemctl list-unit-files | grep rpc-statd > /dev/null; then EXEC_MODE=3 return 0 fi @@ -354,6 +354,8 @@ v3locking_exec() if [ $EXEC_MODE -eq 2 ]; then systemctl $cmd nfs-lock.service + elif [ $EXEC_MODE -eq 3 ]; then + systemctl $cmd rpc-statd.service else case $cmd in start) locking_start;; -- 2.6.3
