From bc6f33cc3e02aae2e2db2c8f0748ddfddedaf95adae4995bce77e46e596feaad Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 18 Dec 2007 17:53:26 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=14

---
 nfs-utils.changes |  8 ++++++++
 nfs-utils.spec    |  7 ++++++-
 nfs.init          | 10 ++++++++++
 nfsserver.init    |  2 +-
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/nfs-utils.changes b/nfs-utils.changes
index 481857a..6bfc6c0 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Dec 17 23:19:36 CET 2007 - nfbrown@suse.de
+
+- Fix sed script used to create bind mounts for NFSv4 export
+  (#279665)
+- Fail nfs.init if portmap is not running.  Normally it will be,
+  but if it isn't nfs can fail strangely. (#325763)
+
 -------------------------------------------------------------------
 Mon Dec 17 02:29:08 CET 2007 - nfbrown@suse.de
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index e3ce1b6..602547d 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -15,7 +15,7 @@ BuildRequires:  e2fsprogs-devel gcc-c++ krb5-devel libevent librpcsecgss nfsidma
 Url:            http://nfs.sourceforge.net
 Summary:        Support Utilities for Kernel nfsd
 Version:        1.1.0
-Release:        9
+Release:        10
 Group:          Productivity/Networking/NFS
 License:        GPL v2 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -249,6 +249,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Dec 17 2007 - nfbrown@suse.de
+- Fix sed script used to create bind mounts for NFSv4 export
+  (#279665)
+- Fail nfs.init if portmap is not running.  Normally it will be,
+  but if it isn't nfs can fail strangely. (#325763)
+* Mon Dec 17 2007 - nfbrown@suse.de
 - Add SuSEfirewall2 config files for nfs-client and nfs-kernel-server
   (#247354)
 * Mon Nov 12 2007 - ro@suse.de
diff --git a/nfs.init b/nfs.init
index a5d516d..7f6bd31 100644
--- a/nfs.init
+++ b/nfs.init
@@ -128,6 +128,13 @@ rc_reset
 case "$1" in
     start|reload)
 	echo -n "Starting NFS client services:"
+	if ! checkproc /sbin/portmap ; then
+	   echo "portmap is not running"
+	   rc_failed 3
+	   rc_status -v
+	   rc_exit
+	fi
+
 	# in case we need /usr via nfs 
 	mount_usr
 	# sm-notify
@@ -249,6 +256,9 @@ case "$1" in
 	    echo "idmapd not running"
 	    rc_failed 3
 	fi
+	if ! checkproc /sbin/portmap; then
+	    echo "Warning: portmap not running - nfs may not work well"
+	fi
         rc_status -v
 	;;
     try-restart|condrestart)
diff --git a/nfsserver.init b/nfsserver.init
index 2c400d6..6f8549c 100644
--- a/nfsserver.init
+++ b/nfsserver.init
@@ -91,7 +91,7 @@ nfs4_bind_mounts() {
 
     # In case of doubt, try "man sed" :-)
     cat /etc/exports |
-	    sed ':-0;s/\\$//;T;N;s/\n[[:space:]]*/ /;b-0' |
+	    sed -n 'H;g;s/\\$//;h;t;s/^\n//;s/\n[[:space:]]*//g;s/#.*//;p;s/.*//;h' |
 	    sed 's/^\([^[:space:]]*\).*bind=\([^,)]*\).*/\1 \2/;t;d' |
 	    sort |
 	    while read export dir; do