From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 17 Dec 2010 21:19:08 +0000 (+0000)
Subject: Merged revisions 298827 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2052
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8744246aa377d2275f6f72e745ee11bdc13bac8;p=thirdparty%2Fasterisk.git

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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@298833 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk
index c2812b8644..3d06f9556b 100755
--- a/contrib/init.d/rc.debian.asterisk
+++ b/contrib/init.d/rc.debian.asterisk
@@ -100,6 +100,8 @@ case "$1" in
 		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"