Accepting request 72261 from home:lnussel:branches:Base:System

- use /var/run/nfs instead of /var/lock/subsys

OBS-URL: https://build.opensuse.org/request/show/72261
OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=47

nfs-utils.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 31 11:43:41 UTC 2011 - lnussel@suse.de
+
+- use /var/run/nfs instead of /var/lock/subsys
+
 -------------------------------------------------------------------
 Tue May 31 01:41:58 UTC 2011 - nfbrown@novell.com
 

nfs-utils.spec

@@ -205,6 +205,15 @@ useradd -r -c 'NFS statd daemon' \
 %post -n nfs-client
 chown statd:nogroup /var/lib/nfs
 chown -R statd /var/lib/nfs/{state,sm,sm.bak} >& /dev/null || :
+### migrate from /var/lock/subsys
+[ -d /var/run/nfs ] || mkdir /var/run/nfs
+if [ -f /var/lock/subsys/nfs-rpc.idmapd ]; then
+	mv /var/lock/subsys/nfs-rpc.idmapd /var/run/nfs
+fi
+if [ -f /var/lock/subsys/nfsserver-rpc.idmapd ]; then
+	mv /var/lock/subsys/nfsserver-rpc.idmapd /var/run/nfs
+fi
+###
 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
 %{fillup_and_insserv -n nfs nfs}
 #
@@ -225,6 +234,15 @@ chown -R statd /var/lib/nfs/{state,sm,sm.bak} >& /dev/null || :
 %stop_on_removal nfsserver
 
 %post -n nfs-kernel-server
+### migrate from /var/lock/subsys
+[ -d /var/run/nfs ] || mkdir /var/run/nfs
+if [ -f /var/lock/subsys/nfs-rpc.idmapd ]; then
+	mv /var/lock/subsys/nfs-rpc.idmapd /var/run/nfs
+fi
+if [ -f /var/lock/subsys/nfsserver-rpc.idmapd ]; then
+	mv /var/lock/subsys/nfsserver-rpc.idmapd /var/run/nfs
+fi
+###
 %{fillup_and_insserv nfsserver}
 
 %postun -n nfs-kernel-server

nfs.init

@@ -24,12 +24,13 @@
 . /etc/rc.status
 . /etc/sysconfig/nfs
 
+# XXX: there should be separate init scripts for these really
 IDMAPD_BIN=/usr/sbin/rpc.idmapd
 GSSD_BIN=/usr/sbin/rpc.gssd
 STATD_BIN=/usr/sbin/rpc.statd
 
-IDMAPD_CLIENT_STATE=/var/lock/subsys/nfs-rpc.idmapd
+IDMAPD_CLIENT_STATE=/var/run/nfs/nfs-rpc.idmapd
-IDMAPD_SERVER_STATE=/var/lock/subsys/nfsserver-rpc.idmapd
+IDMAPD_SERVER_STATE=/var/run/nfs/nfsserver-rpc.idmapd
 
 NEED_IDMAPD=no
 NEED_GSSD=no
@@ -213,7 +214,8 @@ case "$1-$nfs" in
 	        rc_status -v
 	        rc_exit
 	    }
-            echo $IDMAPD_BIN > $IDMAPD_CLIENT_STATE
+	    [ -d /var/run/nfs ] || mkdir /var/run/nfs
+	    echo $IDMAPD_BIN > $IDMAPD_CLIENT_STATE
 	fi
 
 	rc_status -v

nfsserver.init

@@ -50,12 +50,13 @@ rc_reset
 # with force-reload (in case signalling is not supported) are
 # considered a success.
 
+# XXX: there should be separate init scripts for these really
 SVCGSSD_BIN=/usr/sbin/rpc.svcgssd
 IDMAPD_BIN=/usr/sbin/rpc.idmapd
 NFSD_BIN=/usr/sbin/rpc.nfsd
 
-IDMAPD_CLIENT_STATE=/var/lock/subsys/nfs-rpc.idmapd
+IDMAPD_CLIENT_STATE=/var/run/nfs/nfs-rpc.idmapd
-IDMAPD_SERVER_STATE=/var/lock/subsys/nfsserver-rpc.idmapd
+IDMAPD_SERVER_STATE=/var/run/nfs/nfsserver-rpc.idmapd
 
 NEED_SVCGSSD=no
 NEED_IDMPAPD=no
@@ -202,6 +203,7 @@ case "$1" in
               rc_status -v
               rc_exit
           }
+	  [ -d /var/run/nfs ] || mkdir /var/run/nfs
 	  echo $IDMAPD_BIN > $IDMAPD_SERVER_STATE
       fi
       # exportfs