SOURCES: awffull.cron, awffull.sysconfig - when multiple files opt...

[blues]

Author: blues                        Date: Fri Jun 30 14:34:53 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- when multiple files option is "yes" don't try to parse /etc/awffull.conf

---- Files affected:
SOURCES:
   awffull.cron (1.4 -> 1.5) , awffull.sysconfig (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/awffull.cron
diff -u SOURCES/awffull.cron:1.4 SOURCES/awffull.cron:1.5
--- SOURCES/awffull.cron:1.4	Fri Jun 30 15:33:27 2006
+++ SOURCES/awffull.cron	Fri Jun 30 16:34:48 2006
@@ -16,14 +16,14 @@
 		AWFFULL_OPTS="-q"
 	fi
 	
-	if [ -f /etc/awffull.conf ]; then
-		CONFIG_LIST="/etc/awffull.conf"
-	fi
 	if [ -n "$MULTIPLE" ] && [ "$MULTIPLE" = "yes" -o "$MULTIPLE" = "YES" ]; then
 		for config in $(ls /etc/awffull/*.conf 2>/dev/null); do\
 			CONFIG_LIST="${CONFIG_LIST} ${config}"
 		done
+	else
+		CONFIG_LIST="/etc/awffull.conf"
 	fi
+
 	for singleconfig in ${CONFIG_LIST}; do
 		if [ -n "${USE_DNSHISTORY}" ] && [ "${USE_DNSHISTORY}" = "yes" -o "${USE_DNSHISTORY}" = "YES" ]; then
 			TMPCONFIG=`mktemp -q /var/lib/dnshistory/awffull_config.XXXXXX`

================================================================
Index: SOURCES/awffull.sysconfig
diff -u SOURCES/awffull.sysconfig:1.2 SOURCES/awffull.sysconfig:1.3
--- SOURCES/awffull.sysconfig:1.2	Wed Jun 28 00:39:43 2006
+++ SOURCES/awffull.sysconfig	Fri Jun 30 16:34:48 2006
@@ -7,6 +7,9 @@
 # LANG="pl_PL"
 
 # Allow multiple configs in /etc/awffull/
+# Files must have names: *.conf
+# Warning: it disables parsing /etc/awffull.conf. If you want to make use
+# of that file - move it into /etc/awffull/
 MULTIPLE="yes"
 
 # Use dnshistory for resolving IP into DNS-name
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/awffull.cron?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/awffull.sysconfig?r1=1.2&r2=1.3&f=u