SOURCES: rquotad.init, rquotad.sysconfig - sanitize options, there...

[baggins]

Author: baggins                      Date: Thu Mar 22 01:02:06 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- sanitize options, there is only a few of them
- removed RQUOTADOPTIONS from sysconfig file, will be removed in future from init script

---- Files affected:
SOURCES:
   rquotad.init (1.14 -> 1.15) , rquotad.sysconfig (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/rquotad.init
diff -u SOURCES/rquotad.init:1.14 SOURCES/rquotad.init:1.15
--- SOURCES/rquotad.init:1.14	Tue Mar 20 13:39:32 2007
+++ SOURCES/rquotad.init	Thu Mar 22 02:02:01 2007
@@ -33,20 +33,21 @@
 	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

================================================================
Index: SOURCES/rquotad.sysconfig
diff -u SOURCES/rquotad.sysconfig:1.2 SOURCES/rquotad.sysconfig:1.3
--- SOURCES/rquotad.sysconfig:1.2	Fri Oct 13 11:16:57 2006
+++ SOURCES/rquotad.sysconfig	Thu Mar 22 02:02:01 2007
@@ -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=
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rquotad.init?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SOURCES/rquotad.sysconfig?r1=1.2&r2=1.3&f=u