From 582cc9a34005f2a941ab1a959b47e6e491cef0468a00d37866118069874e5e08 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Sat, 15 Jan 2011 02:00:38 +0000
Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/nfs-utils
 revision 65.0

OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=1746b6dc5f4f682b45fb032f2d9ca538
---
 nfs-utils.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 9f0c8c9..44f3969 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package nfs-utils (Version 1.2.3)
+# spec file for package nfs-utils
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -27,7 +27,7 @@ BuildRequires:  libevent
 Url:            http://nfs.sourceforge.net
 Summary:        Support Utilities for Kernel nfsd
 Version:        1.2.3
-Release:        2
+Release:        3
 Group:          Productivity/Networking/NFS
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

From 64a7fab5972da71a374e5da94b129f05dec55e6af918a5742401ca7a9c5d1769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Tue, 25 Jan 2011 12:13:59 +0000
Subject: [PATCH 2/2] Accepting request 59078 from
 home:lnussel:branches:Base:System

OBS-URL: https://build.opensuse.org/request/show/59078
OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=31
---
 nfs-utils.changes |  6 ++++++
 start-statd       | 21 +++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/nfs-utils.changes b/nfs-utils.changes
index bfd0b52..3993772 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 25 09:01:37 UTC 2011 - lnussel@suse.de
+
+- give user a hint if portmap isn't running as statd can't be started in that
+  case.
+
 -------------------------------------------------------------------
 Wed Jan 12 12:15:31 UTC 2011 - lnussel@suse.de
 
diff --git a/start-statd b/start-statd
index 9026b09..ff3e07c 100644
--- a/start-statd
+++ b/start-statd
@@ -5,9 +5,22 @@
 # It should run run statd with whatever flags are apropriate for this
 # site.
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
+checkproc /usr/sbin/rpc.statd && exit 0
+. /etc/rc.status
 . /etc/sysconfig/nfs
-rpc.statd --no-notify $STATD_OPTIONS
-# in case firewall needs to punch a hole for the
-# statd port...
-/etc/init.d/SuSEfirewall2_setup try-restart > /dev/null 2>&1
+rc_reset
+echo -n "Starting rpc.statd ..."
+if ! rpcinfo -p localhost >/dev/null 2>/dev/null; then
+	echo -n " ${extd}portmapper not running${norm}"
+	rc_failed 1
+	rc_status -v
+	rc_exit
+fi
+# TODO: write init script and call that one via /sbin/service instead
+start_daemon /usr/sbin/rpc.statd --no-notify $STATD_OPTIONS
+if rc_status -v; then
+	# in case firewall needs to punch a hole for the
+	# statd port...
+	/etc/init.d/SuSEfirewall2_setup try-restart
+fi