From 0bc1e63ccef1dfd7eb40a175285312eace0a92f0d119dfbc05ed825e56180757 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 2 Feb 2011 00:47:25 +0000 Subject: [PATCH 1/5] Updating link to change in openSUSE:Factory/nfs-utils revision 69.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=1432e81b25a180c43f58d410c51abb35 --- nfs-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nfs-utils.spec b/nfs-utils.spec index 318d3be..143e257 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -27,7 +27,7 @@ BuildRequires: libevent Url: http://nfs.sourceforge.net Summary: Support Utilities for Kernel nfsd Version: 1.2.3 -Release: 4 +Release: 5 Group: Productivity/Networking/NFS License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build From 80c4021aa6364b72f7cf1f946042e2665e7b114bd67a0b9e2e19dda820b097b6 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Tue, 8 Feb 2011 04:51:37 +0000 Subject: [PATCH 2/5] - sysconfig.nfs: add variable "RQUOTAD_PORT" to set the port that rquotad uses. Note that this field will be handled by rquotad which is in a different package. We put the definition here because it makes sense to keep NFS related things together (bnc#637382) OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=36 --- nfs-utils.changes | 9 +++++++++ sysconfig.nfs | 12 ++++++++++++ 2 files changed, 21 insertions(+) diff --git a/nfs-utils.changes b/nfs-utils.changes index 1250396..16b50b9 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Feb 7 01:05:55 UTC 2011 - nfbrown@novell.com + +- sysconfig.nfs: add variable "RQUOTAD_PORT" to set the port that + rquotad uses. Note that this field will be handled by rquotad + which is in a different package. We put the definition here + because it makes sense to keep NFS related things together + (bnc#637382) + ------------------------------------------------------------------- Mon Jan 31 07:49:03 UTC 2011 - lnussel@suse.de diff --git a/sysconfig.nfs b/sysconfig.nfs index e357570..fc0e3d5 100644 --- a/sysconfig.nfs +++ b/sysconfig.nfs @@ -20,6 +20,18 @@ USE_KERNEL_NFSD_NUMBER="4" # MOUNTD_PORT="" +## Path: Network/File systems/NFS server +## Description: use fixed port number for rquotad +## Type: integer +## Default: "" +## ServiceRestart: quotad +# +# Only set this if you want to start quotad on a fixed +# port instead of the port assigned by rpc. Only for use +# to export nfs-filesystems through firewalls. +# +RQUOTAD_PORT="" + ## Path: Network/File systems/NFS server ## Description: GSS security for NFS ## Type: yesno From 87be134f782631697d79ca33d964bf8ecc62803929b011b463564b8c4ee31dbf Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Wed, 16 Feb 2011 23:44:37 +0000 Subject: [PATCH 3/5] Revert last change OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=37 --- nfs-utils.changes | 9 --------- sysconfig.nfs | 12 ------------ 2 files changed, 21 deletions(-) diff --git a/nfs-utils.changes b/nfs-utils.changes index 16b50b9..1250396 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Mon Feb 7 01:05:55 UTC 2011 - nfbrown@novell.com - -- sysconfig.nfs: add variable "RQUOTAD_PORT" to set the port that - rquotad uses. Note that this field will be handled by rquotad - which is in a different package. We put the definition here - because it makes sense to keep NFS related things together - (bnc#637382) - ------------------------------------------------------------------- Mon Jan 31 07:49:03 UTC 2011 - lnussel@suse.de diff --git a/sysconfig.nfs b/sysconfig.nfs index fc0e3d5..e357570 100644 --- a/sysconfig.nfs +++ b/sysconfig.nfs @@ -20,18 +20,6 @@ USE_KERNEL_NFSD_NUMBER="4" # MOUNTD_PORT="" -## Path: Network/File systems/NFS server -## Description: use fixed port number for rquotad -## Type: integer -## Default: "" -## ServiceRestart: quotad -# -# Only set this if you want to start quotad on a fixed -# port instead of the port assigned by rpc. Only for use -# to export nfs-filesystems through firewalls. -# -RQUOTAD_PORT="" - ## Path: Network/File systems/NFS server ## Description: GSS security for NFS ## Type: yesno From 5851cf522de8caa7108d589105a81a6ba232f4761d6c5e6efbc9972e91642a39 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Wed, 16 Feb 2011 23:51:28 +0000 Subject: [PATCH 4/5] - nfsserver.init: make sure sm-notify runs on restart. If we stop nfsd, that might also stop lockd which would drop locks. So make sure lockd really does drop lock for consistency, and ensure that sm-notify is run when nfsserver is restarted. (bnc#668280) OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=38 --- nfs-utils.changes | 9 +++++++++ nfsserver.init | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/nfs-utils.changes b/nfs-utils.changes index 1250396..0cbac07 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Feb 16 23:49:40 UTC 2011 - nfbrown@novell.com + +- nfsserver.init: make sure sm-notify runs on restart. + If we stop nfsd, that might also stop lockd which would + drop locks. So make sure lockd really does drop lock + for consistency, and ensure that sm-notify is run when + nfsserver is restarted. (bnc#668280) + ------------------------------------------------------------------- Mon Jan 31 07:49:03 UTC 2011 - lnussel@suse.de diff --git a/nfsserver.init b/nfsserver.init index 5c2f9f5..e037df6 100644 --- a/nfsserver.init +++ b/nfsserver.init @@ -248,7 +248,12 @@ case "$1" in if ! checkproc -n lockd; then echo -n " statd" killproc rpc.statd + else + # tell lockd to drop all client locks + killproc -n -KILL lockd fi + # make sure sm-notify is run on restart, as we have dropped some locks + rm -f /var/run/sm-notify.pid # # rpc.mountd echo -n " mountd" From cc1abc1879785be7af0ed8b825106e0aa0394ee5ea28ed5f442cc39fea2f4187 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Wed, 16 Feb 2011 23:59:03 +0000 Subject: [PATCH 5/5] - nfs.init: improve handling of paths with spaces. If a path name has a space, it will appear as \040 in fstab and in /proc/mounts. Using 'grep -E' to search for this is problematic as it will interpret the '\'. So use 'grep -F' instead - we know there is only a single space in /proc/mounts. Also use "read -r" so 'read' doesn't interpret the '/'. (bnc#666128) OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=39 --- nfs-utils.changes | 12 ++++++++++++ nfs.init | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/nfs-utils.changes b/nfs-utils.changes index 0cbac07..4e28bcd 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Feb 16 23:55:22 UTC 2011 - nfbrown@novell.com + +- nfs.init: improve handling of paths with spaces. + If a path name has a space, it will appear as \040 + in fstab and in /proc/mounts. Using 'grep -E' to search + for this is problematic as it will interpret the + '\'. So use 'grep -F' instead - we know there is + only a single space in /proc/mounts. Also use + "read -r" so 'read' doesn't interpret the '/'. + (bnc#666128) + ------------------------------------------------------------------- Wed Feb 16 23:49:40 UTC 2011 - nfbrown@novell.com diff --git a/nfs.init b/nfs.init index 6e0871b..e52d178 100644 --- a/nfs.init +++ b/nfs.init @@ -43,7 +43,7 @@ if [ "x$nfs" != "xyes" ] then nfs=no fi -while read what where type options rest ; do +while read -r what where type options rest ; do case "$what" in \#*|"") continue ;; esac @@ -56,7 +56,7 @@ while read what where type options rest ; do esac nfs=yes if test "$1" = status ; then - grep -qE "^$what[[:blank:]]+$where[[:blank:]]+nfs" /proc/mounts && continue + grep -qF "$what $where nfs" /proc/mounts && continue state=3 continue fi