From 398d0be1566bd1b86adf87669c6aa7f6cd9ea982897dd520ce12cefccfae0919 Mon Sep 17 00:00:00 2001
From: Neil Brown <nfbrown@suse.com>
Date: Tue, 4 Feb 2014 05:38:21 +0000
Subject: [PATCH] - nfs-utils.spec: Require keyutils for proper   idmap lookup.
 - nfs.init, nfsserver.init: mkdir /run/nfs before   trying to create a file
 in there (bnc#859221) - nfs.init, nfsserver.init: add    
 X-Systemd-RemainAfterExit: true   to ensure services aren't shutdown if
 sm-notify   reports an error   (bnc#849387)

OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=109
---
 nfs-utils.changes | 13 +++++++++++++
 nfs-utils.spec    |  3 ++-
 nfs.init          |  2 ++
 nfsserver.init    |  2 ++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/nfs-utils.changes b/nfs-utils.changes
index 3eb99f5..7fa9b51 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Feb  4 05:18:48 UTC 2014 - nfbrown@suse.com
+
+- nfs-utils.spec: Require keyutils for proper
+  idmap lookup.
+- nfs.init, nfsserver.init: mkdir /run/nfs before
+  trying to create a file in there (bnc#859221)
+- nfs.init, nfsserver.init: add
+    X-Systemd-RemainAfterExit: true
+  to ensure services aren't shutdown if sm-notify
+  reports an error
+  (bnc#849387)
+
 -------------------------------------------------------------------
 Wed Nov 27 09:00:36 UTC 2013 - nfbrown@suse.com
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index ef3f1b3..7dc8a43 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package nfs-utils
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -94,6 +94,7 @@ quota over NFS support, install the quota package.
 Summary:        Support Utilities for NFS
 Group:          Productivity/Networking/NFS
 Obsoletes:      nfs-utils < 1.1.0
+Requires:       keyutils
 Requires:       netcfg
 Requires:       rpcbind
 PreReq:         %fillup_prereq %insserv_prereq
diff --git a/nfs.init b/nfs.init
index d045794..b667fdb 100644
--- a/nfs.init
+++ b/nfs.init
@@ -20,6 +20,7 @@
 # Default-Stop:   0 1 2 6
 # Short-Description: NFS client services
 # Description:    All necessary services for NFS clients
+# X-Systemd-RemainAfterExit: true
 ### END INIT INFO
 
 . /etc/rc.status
@@ -223,6 +224,7 @@ case "$1-$nfs" in
 	        rc_status -v
 	        rc_exit
 	    }
+	    [ -d /run/nfs ] || mkdir /run/nfs
 	    echo $GSSD_BIN > $GSSD_CLIENT_STATE
 	fi
 
diff --git a/nfsserver.init b/nfsserver.init
index 92b6b28..a65a805 100644
--- a/nfsserver.init
+++ b/nfsserver.init
@@ -17,6 +17,7 @@
 # Default-Start:  3 5
 # Default-Stop:   0 1 2 6
 # Short-Description: Start the kernel based NFS daemon
+# X-Systemd-RemainAfterExit: true
 ### END INIT INFO
 
 . /etc/sysconfig/nfs
@@ -229,6 +230,7 @@ case "$1" in
               rc_status -v
               rc_exit
           }
+	  [ -d /run/nfs ] || mkdir /run/nfs
 	  echo $GSSD_BIN > $GSSD_SERVER_STATE
       fi
       if [ "$NEED_IDMAPD" = yes ]; then