Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at Mon Jun 6 11:53:37 CEST 2011.
-------- --- nfs-utils/nfs-utils.changes 2011-05-31 03:43:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/nfs-utils/nfs-utils.changes 2011-06-02 08:49:11.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Jun 2 06:48:03 UTC 2011 - [email protected] + +- nfsserver.init, sysconfig.nfs: add NFSV4LEASETIME + parameter to allow lease time to be set. + bnc#681510 + +------------------------------------------------------------------- +Tue May 31 11:43:41 UTC 2011 - [email protected] + +- use /var/run/nfs instead of /var/lock/subsys + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.151U93/_old 2011-06-06 11:52:41.000000000 +0200 +++ /var/tmp/diff_new_pack.151U93/_new 2011-06-06 11:52:41.000000000 +0200 @@ -27,7 +27,7 @@ Url: http://nfs.sourceforge.net Summary: Support Utilities for Kernel nfsd Version: 1.2.3 -Release: 19 +Release: 21 Group: Productivity/Networking/NFS License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -205,6 +205,15 @@ %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 @@ %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 ++++++ --- /var/tmp/diff_new_pack.151U93/_old 2011-06-06 11:52:42.000000000 +0200 +++ /var/tmp/diff_new_pack.151U93/_new 2011-06-06 11:52:42.000000000 +0200 @@ -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_SERVER_STATE=/var/lock/subsys/nfsserver-rpc.idmapd +IDMAPD_CLIENT_STATE=/var/run/nfs/nfs-rpc.idmapd +IDMAPD_SERVER_STATE=/var/run/nfs/nfsserver-rpc.idmapd NEED_IDMAPD=no NEED_GSSD=no @@ -213,7 +214,8 @@ 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 ++++++ --- /var/tmp/diff_new_pack.151U93/_old 2011-06-06 11:52:42.000000000 +0200 +++ /var/tmp/diff_new_pack.151U93/_new 2011-06-06 11:52:42.000000000 +0200 @@ -50,12 +50,13 @@ # 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_SERVER_STATE=/var/lock/subsys/nfsserver-rpc.idmapd +IDMAPD_CLIENT_STATE=/var/run/nfs/nfs-rpc.idmapd +IDMAPD_SERVER_STATE=/var/run/nfs/nfsserver-rpc.idmapd NEED_SVCGSSD=no NEED_IDMPAPD=no @@ -187,6 +188,10 @@ if [ " `cat /proc/fs/nfsd/threads`" = " 0" ]; then echo $VERSION_LIST > /proc/fs/nfsd/versions fi + if [ -n "$NFSV4LEASETIME" -a -f /proc/fs/nfsd/nfsv4leasetime ]; then + echo "$NFSV4LEASETIME" > /proc/fs/nfsd/nfsv4leasetime + fi + nfs4_bind_mounts # svcgssd; idmapd if [ "$NEED_SVCGSSD" = yes ]; then @@ -202,6 +207,7 @@ rc_status -v rc_exit } + [ -d /var/run/nfs ] || mkdir /var/run/nfs echo $IDMAPD_BIN > $IDMAPD_SERVER_STATE fi # exportfs ++++++ sysconfig.nfs ++++++ --- /var/tmp/diff_new_pack.151U93/_old 2011-06-06 11:52:42.000000000 +0200 +++ /var/tmp/diff_new_pack.151U93/_new 2011-06-06 11:52:42.000000000 +0200 @@ -86,3 +86,17 @@ # STATD_OPTIONS="" +## Path: Network/File systems/NFS server +## Description: Lease time for NFSv4 leases +## Type: integer +## Default: "" +# +# Set the lease time for the NFSv4 server. This allows new locks +# to be taken sooner after a server restart, so it is useful for +# servers which need to recover quickly after a failure, particularly +# in fail-over configurations. Reducing the lease time can be a +# problem is some clients connect over high latency networks. +# The default is 90 seconds. A number like 15 might be appropriate +# in a fail-over configuration with all clients on well connected +# low latency links. +NFSV4LEASETIME="" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
