[asterisk-commits] qwell: trunk r287196 - in /trunk: ./ contrib/init.d/rc.debian.asterisk

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Sep 16 17:05:14 2010
New Revision: 287196

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287196
Log:
Merged revisions 287195 via svnmerge from 
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
........

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=287196&r1=287195&r2=287196
==============================================================================
--- trunk/contrib/init.d/rc.debian.asterisk (original)
+++ trunk/contrib/init.d/rc.debian.asterisk Thu Sep 16 17:05:14 2010
@@ -54,7 +54,7 @@
 . /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