From 634cea2d9263e5273db5bc7084e559d8337f140f0a855facbff60b6d3ea97d5a Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sat, 9 Mar 2013 06:53:10 +0000
Subject: [PATCH] Accepting request 157565 from
 home:deadpoint:branches:Base:System

Updated nfsserver.init and sysconfig.nfs to add support for setting rpc.mountd options in addition to the port. While it's possible to set these by setting the port and adding them after, this is a nicer implementation.

OBS-URL: https://build.opensuse.org/request/show/157565
OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=83
---
 nfs-utils.changes |  6 ++++++
 nfs-utils.spec    |  2 +-
 nfsserver.init    |  4 ++--
 sysconfig.nfs     | 10 ++++++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/nfs-utils.changes b/nfs-utils.changes
index b8c857c..cd9097c 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar  6 20:04:55 UTC 2013 - darin@darins.net
+
+- nfsserver.init,sysconfig.nfs - Add support for setting rpc.mountd
+  options. 
+
 -------------------------------------------------------------------
 Wed Nov 28 00:08:55 UTC 2012 - nfbrown@suse.com
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index a750834..a394fcc 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package nfs-utils
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
diff --git a/nfsserver.init b/nfsserver.init
index 7c60964..e3c82e8 100644
--- a/nfsserver.init
+++ b/nfsserver.init
@@ -215,9 +215,9 @@ case "$1" in
       # rpc.mountd
       echo -n " mountd"
       if [ -n "$MOUNTD_PORT" ] ; then
-	startproc /usr/sbin/rpc.mountd -p $MOUNTD_PORT $VERSION_PARAMS
+	startproc /usr/sbin/rpc.mountd -p $MOUNTD_PORT $MOUNTD_OPTIONS $VERSION_PARAMS
       else
-	startproc /usr/sbin/rpc.mountd $VERSION_PARAMS
+	startproc /usr/sbin/rpc.mountd $MOUNTD_OPTIONS $VERSION_PARAMS
       fi || {
           rc_status -v
           rc_exit
diff --git a/sysconfig.nfs b/sysconfig.nfs
index fb4e67c..5fe6312 100644
--- a/sysconfig.nfs
+++ b/sysconfig.nfs
@@ -132,3 +132,13 @@ SVCGSSD_OPTIONS=""
 # This setting allows extra options to be specified for NFSD, such as
 # -H <shared_hostname> in a high-availability configuration.
 NFSD_OPTIONS=""
+
+## Path:                Network/File systems/NFS server
+## Description:         Extra options for mountd
+## Type:                string
+## Default:             ""
+#
+# This setting allows extra options to be specified for rpc.mountd,
+# such as --manage-gids.
+MOUNTD_OPTIONS=""
+