Merged revisions 298827 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Fri, 17 Dec 2010 21:19:08 +0000 (21:19 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Fri, 17 Dec 2010 21:19:08 +0000 (21:19 +0000)
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

contrib/init.d/rc.debian.asterisk

index c2812b8..3d06f95 100755 (executable)
@@ -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"