summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJason Parker <jparker@digium.com>2010-09-16 22:05:14 +0000
committerJason Parker <jparker@digium.com>2010-09-16 22:05:14 +0000
commit667f9d28f88e3dc22a086f7bdc6e6bf248bc42ec (patch)
treee13e8fd4384951e642c92fcfe426c8eeefa0729a /contrib
parentdd1e62c095c1c164e8bf0d8dfc7f7f5cfe93cba7 (diff)
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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287196 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/init.d/rc.debian.asterisk2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk
index a59431d34..c2812b864 100755
--- a/contrib/init.d/rc.debian.asterisk
+++ b/contrib/init.d/rc.debian.asterisk
@@ -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