Blame SOURCES/bz1332435-nfsserver-var-lib-nfs-fix.patch

c47dd7
diff -uNr a/heartbeat/nfsserver b/heartbeat/nfsserver
c47dd7
--- a/heartbeat/nfsserver	2016-04-11 10:28:05.988977035 +0200
c47dd7
+++ b/heartbeat/nfsserver	2016-04-11 16:31:50.150445968 +0200
c47dd7
@@ -332,7 +332,11 @@
c47dd7
 
c47dd7
 	case $EXEC_MODE in 
c47dd7
 		1) ${OCF_RESKEY_nfs_init_script} $cmd;;
c47dd7
-		2) systemctl $cmd ${svc}.service ;;
c47dd7
+		2) if ! echo $svc | grep -q "\."; then
c47dd7
+			svc="${svc}.service"
c47dd7
+		   fi
c47dd7
+		   systemctl $cmd $svc
c47dd7
+		   ;;
c47dd7
 	esac
c47dd7
 }
c47dd7
 
c47dd7
@@ -587,6 +591,12 @@
c47dd7
 		ocf_log debug "$fp is already bound to /var/lib/nfs"
c47dd7
 		return 0
c47dd7
 	fi
c47dd7
+
c47dd7
+	if nfs_exec status var-lib-nfs-rpc_pipefs.mount; then
c47dd7
+		ocf_log debug "/var/lib/nfs/rpc_pipefs already mounted. Unmounting in preparation to bind mount nfs dir"
c47dd7
+		systemctl stop var-lib-nfs-rpc_pipefs.mount
c47dd7
+	fi
c47dd7
+
c47dd7
 	mount --bind $fp /var/lib/nfs
c47dd7
 	[ $SELINUX_ENABLED -eq 0 ] && restorecon /var/lib/nfs
c47dd7
 }