[svn-commits] tilghman: trunk r298833 - in /trunk: ./ contrib/init.d/rc.debian.asterisk

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Dec 17 15:19:08 2010
New Revision: 298833

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=298833
Log:
Merged revisions 298827 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r298827 | tilghman | 2010-12-17 15:18:18 -0600 (Fri, 17 Dec 2010) | 8 lines
  
  -v implies -f, so override with -F.
  
  (closes issue #18446)
   Reported by: lathama
   Patches: 
         rc.debian.asterisk.diff uploaded by lathama (license 1028)
   Tested by: lathama
........

Modified:
    trunk/   (props changed)
    trunk/contrib/init.d/rc.debian.asterisk

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/contrib/init.d/rc.debian.asterisk
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/init.d/rc.debian.asterisk?view=diff&rev=298833&r1=298832&r2=298833
==============================================================================
--- trunk/contrib/init.d/rc.debian.asterisk (original)
+++ trunk/contrib/init.d/rc.debian.asterisk Fri Dec 17 15:19:08 2010
@@ -100,6 +100,8 @@
 		for i in `seq 1 $VERBOSITY`; do
 			ASTARGS="$ASTARGS -v"
 		done
+		# -v implies -f, so we override that implicit specification here
+		ASTARGS="$ASTARGS -F"
 	fi
 	if [ "x$INTERNALTIMING" = "xyes" ]; then
 		ASTARGS="$ASTARGS -I"