- sanitize options, there is only a few of them

- removed RQUOTADOPTIONS from sysconfig file, will be removed in future from init script

Changed files:
    rquotad.init -> 1.15
    rquotad.sysconfig -> 1.3

diff --git a/rquotad.init b/rquotad.init
index 91142916a16d258536916b4f0ef5f3f7f003b318..67d2ae16849088b66f04299ba6a4f27986f3ae86 100644 (file)
--- a/rquotad.init
+++ b/rquotad.init
@@ -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

diff --git a/rquotad.sysconfig b/rquotad.sysconfig
index d7b58a7be7c4abca8e233386fbb9919ebf7c2fe2..bfca73a28e8bf51de413935fb7b1d3db72aba04a 100644 (file)
--- a/rquotad.sysconfig
+++ b/rquotad.sysconfig
@@ -2,7 +2,10 @@
 SERVICE_RUN_NICE_LEVEL="+0"
 
 # Allow remote quota setting
-REMOTE_QUOTA_SETTING=no
+#REMOTE_QUOTA_SETTING="no"
 
-# Options for rquotad
-RQUOTADOPTIONS=""
+# Do not ignore autofs mountpoints
+#AUTOFS="yes"
+
+# Port rquotad should listen on (default is portmap assigned)
+#RQUOTAD_PORT=