Merged revisions 287195 via svnmerge from
authorJason Parker <jparker@digium.com>
Thu, 16 Sep 2010 22:05:14 +0000 (22:05 +0000)
committerJason Parker <jparker@digium.com>
Thu, 16 Sep 2010 22:05:14 +0000 (22:05 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287195 | qwell | 2010-09-16 17:04:38 -0500 (Thu, 16 Sep 2010) | 7 lines

  Don't fail when running the Debian init script directly (as one would normally do).

  readlink apparently returns 1 when the arg isn't a symlink, which caused the script to exit.

  (closes issue #17910)
  Reported by: wurstsalat
........

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

contrib/init.d/rc.debian.asterisk

index a59431d..c2812b8 100755 (executable)
@@ -54,7 +54,7 @@ fi
 . /lib/lsb/init-functions
 
 # Allow configuration overrides in /etc/default/asterisk
-CONFIG0=`readlink $0`
+CONFIG0=`readlink $0 || :` # readlink returns 1 when something isn't a symlink
 if [ "$CONFIG0" = "" ]; then
        CONFIGFILE=/etc/default/`basename $0`
 else