- no need to mount rpc_pipefs here, idmapd will do/already did it for us

[packages/nfs-utils.git] / rquotad.init

diff --git a/rquotad.init b/rquotad.init
index 91142916a16d258536916b4f0ef5f3f7f003b318..6956e71938b6037ad3dc88d46e566332b944d180 100644 (file)
--- a/rquotad.init
+++ b/rquotad.init
@@ -3,7 +3,7 @@
 # rquotad      This shell script takes care of starting and stopping
 #              the NFS quota service.
 #
-# chkconfig:   345 59 21
+# chkconfig:   345 12 82
 # description: NFS is a popular protocol for file sharing across \
 #              TCP/IP networks. This service provides NFS file \
 #              locking functionality.
@@ -33,20 +33,21 @@ if [ -x /sbin/pidof ] && [ "$1" != "stop" ] && [ -z "`/sbin/pidof portmap`" ]; t
        exit 0
 fi
 
-# Sanity checks
-
-if is_yes "$REMOTE_QUOTA_SETTING"; then
-    RQUOTADOPTIONS="$RQUOTADOPTIONS --setquota"
-else
-    RQUOTADOPTIONS="$RQUOTADOPTIONS --no-setquota"
-fi
-
 start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/rquotad ]; then
+               # RQUOTADOPTIONS will be removed in the future
+               OPTIONS="$RQUOTADOPTIONS"
+               [ -n "$RQUOTAD_PORT" ] && OPTIONS="$OPTIONS -p $RQUOTAD_PORT"
+               is_yes "$AUTOFS" && OPTIONS="$OPTIONS --autofs"
+               if is_yes "$REMOTE_QUOTA_SETTING"; then
+                   OPTIONS="$OPTIONS --setquota"
+               else
+                   OPTIONS="$OPTIONS --no-setquota"
+               fi
                # Start daemons.
                msg_starting "NFS quotas"
-               daemon rpc.rquotad $RQUOTADOPTIONS
+               daemon rpc.rquotad $OPTIONS
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/rquotad
        else