From 734e42d2b2de1050da4c81a922ce769e020fc0df Mon Sep 17 00:00:00 2001 From: Sudhansu Date: Thu, 10 Sep 2015 19:59:51 +0530 Subject: [PATCH] CLOUDSTACK-8815 : Issues with cloudstack-management init script instead of using basename use target file. --- packaging/centos63/cloud-ipallocator.rc | 2 +- packaging/centos63/cloud-management.rc | 2 +- packaging/centos7/cloud-ipallocator.rc | 2 +- packaging/fedora20/cloud-ipallocator.rc | 2 +- packaging/fedora20/cloud-management.rc | 2 +- packaging/fedora21/cloud-ipallocator.rc | 2 +- packaging/fedora21/cloud-management.rc | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/centos63/cloud-ipallocator.rc b/packaging/centos63/cloud-ipallocator.rc index d26287dcb3c..d3eadec8a82 100755 --- a/packaging/centos63/cloud-ipallocator.rc +++ b/packaging/centos63/cloud-ipallocator.rc @@ -25,7 +25,7 @@ # set environment variables -SHORTNAME=`basename $0` +SHORTNAME="$(basename $(readlink -f $0))" PIDFILE=/var/run/"$SHORTNAME".pid LOCKFILE=/var/lock/subsys/"$SHORTNAME" LOGFILE=/var/log/cloudstack/ipallocator/ipallocator.log diff --git a/packaging/centos63/cloud-management.rc b/packaging/centos63/cloud-management.rc index 6d2874854ee..f5ed7a8048a 100755 --- a/packaging/centos63/cloud-management.rc +++ b/packaging/centos63/cloud-management.rc @@ -42,7 +42,7 @@ if [ -r /lib/lsb/init-functions ]; then fi -NAME="$(basename $0)" +NAME="$(basename $(readlink -f $0))" export SERVICE_NAME="$NAME" stop() { SHUTDOWN_WAIT="30" diff --git a/packaging/centos7/cloud-ipallocator.rc b/packaging/centos7/cloud-ipallocator.rc index d26287dcb3c..d3eadec8a82 100755 --- a/packaging/centos7/cloud-ipallocator.rc +++ b/packaging/centos7/cloud-ipallocator.rc @@ -25,7 +25,7 @@ # set environment variables -SHORTNAME=`basename $0` +SHORTNAME="$(basename $(readlink -f $0))" PIDFILE=/var/run/"$SHORTNAME".pid LOCKFILE=/var/lock/subsys/"$SHORTNAME" LOGFILE=/var/log/cloudstack/ipallocator/ipallocator.log diff --git a/packaging/fedora20/cloud-ipallocator.rc b/packaging/fedora20/cloud-ipallocator.rc index d26287dcb3c..d3eadec8a82 100755 --- a/packaging/fedora20/cloud-ipallocator.rc +++ b/packaging/fedora20/cloud-ipallocator.rc @@ -25,7 +25,7 @@ # set environment variables -SHORTNAME=`basename $0` +SHORTNAME="$(basename $(readlink -f $0))" PIDFILE=/var/run/"$SHORTNAME".pid LOCKFILE=/var/lock/subsys/"$SHORTNAME" LOGFILE=/var/log/cloudstack/ipallocator/ipallocator.log diff --git a/packaging/fedora20/cloud-management.rc b/packaging/fedora20/cloud-management.rc index 6d2874854ee..f5ed7a8048a 100755 --- a/packaging/fedora20/cloud-management.rc +++ b/packaging/fedora20/cloud-management.rc @@ -42,7 +42,7 @@ if [ -r /lib/lsb/init-functions ]; then fi -NAME="$(basename $0)" +NAME="$(basename $(readlink -f $0))" export SERVICE_NAME="$NAME" stop() { SHUTDOWN_WAIT="30" diff --git a/packaging/fedora21/cloud-ipallocator.rc b/packaging/fedora21/cloud-ipallocator.rc index d26287dcb3c..d3eadec8a82 100755 --- a/packaging/fedora21/cloud-ipallocator.rc +++ b/packaging/fedora21/cloud-ipallocator.rc @@ -25,7 +25,7 @@ # set environment variables -SHORTNAME=`basename $0` +SHORTNAME="$(basename $(readlink -f $0))" PIDFILE=/var/run/"$SHORTNAME".pid LOCKFILE=/var/lock/subsys/"$SHORTNAME" LOGFILE=/var/log/cloudstack/ipallocator/ipallocator.log diff --git a/packaging/fedora21/cloud-management.rc b/packaging/fedora21/cloud-management.rc index 6d2874854ee..f5ed7a8048a 100755 --- a/packaging/fedora21/cloud-management.rc +++ b/packaging/fedora21/cloud-management.rc @@ -42,7 +42,7 @@ if [ -r /lib/lsb/init-functions ]; then fi -NAME="$(basename $0)" +NAME="$(basename $(readlink -f $0))" export SERVICE_NAME="$NAME" stop() { SHUTDOWN_WAIT="30"