- init script and options for blkmapd

Changed files:
    blkmapd.init -> 1.1
    nfs-utils.spec -> 1.214
    nfsfs.sysconfig -> 1.9

diff --git a/blkmapd.init b/blkmapd.init
new file mode 100644 (file)
index 0000000..9386f0f
--- /dev/null
+++ b/blkmapd.init
@@ -0,0 +1,82 @@
+#!/bin/sh
+#
+# blkmapd      Start up and shut down pNFS block layout mapping daemon
+#
+# chkconfig:   345 13 82
+# description: Starts the blkmapd daemon that performs device discovery \
+#              and mapping for the parallel NFS (pNFS) block layout \
+#              client [RFC5663].
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Get network config
+. /etc/sysconfig/network
+
+# Check that networking is up.
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down "pNFS block layout mapping daemon"
+               exit 1
+       fi
+else
+       exit 0
+fi
+
+# Get service config
+[ -f /etc/sysconfig/nfsfs ] && . /etc/sysconfig/nfsfs
+
+is_yes "${ENABLE_PNFS}" || exit 0
+
+start() {
+       # Check if the service is already running?
+       if [ -f /var/lock/subsys/blkmapd ]; then
+               msg_already_running "pNFS block layout mapping daemon"
+               return
+       fi
+
+       if ! grep -q rpc_pipefs /proc/mounts; then
+               modprobe sunrpc >/dev/null 2>&1
+               run_cmd "Mounting /var/lib/nfs/rpc_pipefs filesystem" \
+                       mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
+       fi
+       msg_starting "pNFS block layout mapping daemon"
+       daemon /usr/sbin/blkmapd $BLKMAPDOPTIONS
+       RETVAL=$?
+       [ $RETVAL = 0 ] && touch /var/lock/subsys/blkmapd
+}
+
+stop() {
+       if [ ! -f /var/lock/subsys/blkmapd ]; then
+               msg_not_running "pNFS block layout mapping daemon"
+               return
+       fi
+
+       msg_stopping "pNFS block layout mapping daemon"
+       killproc blkmapd
+       rm -f /var/lock/subsys/blkmapd
+}
+
+# See how we were called.
+RETVAL=0
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
+       ;;
+  restart|reload)
+       stop
+       start
+       ;;
+  status)
+       status blkmapd
+       RETVAL=$?
+       ;;
+  *)
+       msg_usage "$0 {start|stop|restart|status}"
+       exit 1
+esac
+
+exit $RETVAL

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 7b555d6d3462721745408a40db088649a0944acb..fdeabc678799804650637f6e19926522d7e2952e 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -31,6 +31,7 @@ Source7:      rpcsvcgssd.init
 Source8:       nfs.sysconfig
 Source9:       nfslock.sysconfig
 Source10:      nfsfs.sysconfig
+Source11:      blkmapd.init
 Patch0:                %{name}-install.patch
 Patch1:                %{name}-statdpath.patch
 Patch2:                %{name}-subsys.patch
@@ -225,6 +226,7 @@ install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfsfs
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/idmapd
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/gssd
 install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/svcgssd
+install %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/blkmapd
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/nfsd
 install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/nfslock
 install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/nfsfs

diff --git a/nfsfs.sysconfig b/nfsfs.sysconfig
index 802ed73c5b65133b48405bfdef4fb51afa58e84f..3c078b8f1746361faa05674c8ee2b66b1d3428ea 100644 (file)
--- a/nfsfs.sysconfig
+++ b/nfsfs.sysconfig
@@ -10,6 +10,12 @@
 # Options for NFSv4 rpcsec_gss daemon
 #RPCGSSOPTIONS=
 
+# Uncomment if you want to mount pNFS volumes
+#ENABLE_PNFS=yes
+
+# Options for pNFS blkmapd daemon
+#BLKMAPDOPTIONS=
+
 # Space separated list of mount points that init script should not even
 # try to umount because it will not work 
 # May contain regular expressions (ex. "/dev/union/.*")