Updated Branches: refs/heads/master 0ff6612f7 -> 0cc4636a2
Summary: packaging updates Empty paths lead to unpleasant surpises later on Use basename to find the pid file when stopping tomcat Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0cc4636a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0cc4636a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0cc4636a Branch: refs/heads/master Commit: 0cc4636a2d03570e89a514f3309947a851446cb7 Parents: 0ff6612 Author: Hugo Trippaers <[email protected]> Authored: Tue Feb 5 15:04:58 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Tue Feb 5 15:06:08 2013 +0100 ---------------------------------------------------------------------- packaging/centos63/cloud-management.rc | 8 ++++---- packaging/centos63/replace.properties | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0cc4636a/packaging/centos63/cloud-management.rc ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud-management.rc b/packaging/centos63/cloud-management.rc index 48c2ab4..6fd435b 100755 --- a/packaging/centos63/cloud-management.rc +++ b/packaging/centos63/cloud-management.rc @@ -46,8 +46,8 @@ NAME="$(basename $0)" stop() { SHUTDOWN_WAIT="30" count="0" - if [ -f /var/run/cloud-management.pid ]; then - pid=`cat /var/run/cloud-management.pid` + if [ -f /var/run/${NAME}.pid ]; then + pid=`cat /var/run/${NAME}.pid` kill $pid &>/dev/null until [ "$(ps --pid $pid | grep -c $pid)" -eq "0" ] || \ [ "$count" -gt "$SHUTDOWN_WAIT" ] @@ -78,8 +78,8 @@ set_ulimit() { handle_pid_file() { if [ "$1" -ne 0 ] ; then - echo "The pid file locates at /var/run/cloud-management.pid and lock file at /var/lock/subsys/cloud-management. - Starting cloud-management will take care of them or you can manually clean up." + echo "The pid file locates at /var/run/${NAME}.pid and lock file at /var/lock/subsys/${NAME}. + Starting ${NAME} will take care of them or you can manually clean up." fi } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0cc4636a/packaging/centos63/replace.properties ---------------------------------------------------------------------- diff --git a/packaging/centos63/replace.properties b/packaging/centos63/replace.properties index f7e5748..bcc4d4a 100644 --- a/packaging/centos63/replace.properties +++ b/packaging/centos63/replace.properties @@ -48,8 +48,8 @@ MSLOGDIR=/var/log/cloudstack/management/ MSMNTDIR=/var/lib/cloud/mnt MSUSER=cloud PIDDIR=/var/run -PLUGINJAVADIR= -PREMIUMJAVADIR= +PLUGINJAVADIR=/usr/share/cloudstack-management/plugin +PREMIUMJAVADIR=/usr/share/cloudstack-management/premium PYTHONDIR=/usr/lib/python2.6/site-packages/ SERVERSYSCONFDIR=/etc/sysconfig SETUPDATADIR=/usr/share/cloudstack-management/setup
