CLOUDSTACK-6220: Fix cloudstack init scripts so that they don't use fully qualified path as script name. Fix for commit 9dd57c22b02afcddb1d6c8ddc3e1b578961454e3
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d033ca48 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d033ca48 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d033ca48 Branch: refs/heads/resize-root Commit: d033ca486bf9bc22a2afe314d00150ec6019c809 Parents: bf9375b Author: Marcus Sorensen <[email protected]> Authored: Mon Mar 10 15:34:55 2014 -0600 Committer: Marcus Sorensen <[email protected]> Committed: Mon Mar 10 15:34:55 2014 -0600 ---------------------------------------------------------------------- agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in | 2 +- agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in | 2 +- agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in | 2 +- agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in | 2 +- agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in | 2 +- packaging/centos63/cloud-agent.rc | 2 +- packaging/centos63/cloud-ipallocator.rc | 2 +- python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 2 +- python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 2 +- python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in | 2 +- python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 2 +- python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in | 2 +- python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in | 2 +- .../distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in | 2 +- .../distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in | 2 +- systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in | 2 +- systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in ---------------------------------------------------------------------- diff --git a/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in b/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in index 60e1e04..704ef6b 100755 --- a/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in +++ b/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in @@ -26,7 +26,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@AGENTLOG@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in ---------------------------------------------------------------------- diff --git a/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in b/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in index 60e1e04..704ef6b 100755 --- a/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in +++ b/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in @@ -26,7 +26,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@AGENTLOG@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in ---------------------------------------------------------------------- diff --git a/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in b/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in index 2422268..e684888 100644 --- a/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in +++ b/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in @@ -33,7 +33,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@AGENTLOG@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in ---------------------------------------------------------------------- diff --git a/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in b/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in index 60e1e04..704ef6b 100644 --- a/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in +++ b/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in @@ -26,7 +26,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@AGENTLOG@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in ---------------------------------------------------------------------- diff --git a/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in b/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in index 2422268..e684888 100644 --- a/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in +++ b/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in @@ -33,7 +33,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@AGENTLOG@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/packaging/centos63/cloud-agent.rc ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc index 40c358e..af1c624 100755 --- a/packaging/centos63/cloud-agent.rc +++ b/packaging/centos63/cloud-agent.rc @@ -26,7 +26,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=/var/run/"$SHORTNAME".pid LOCKFILE=/var/lock/subsys/"$SHORTNAME" LOGDIR=/var/log/cloudstack/agent http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/packaging/centos63/cloud-ipallocator.rc ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud-ipallocator.rc b/packaging/centos63/cloud-ipallocator.rc index 9a24d8d..9d1adb4 100755 --- a/packaging/centos63/cloud-ipallocator.rc +++ b/packaging/centos63/cloud-ipallocator.rc @@ -25,7 +25,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=/var/run/"$SHORTNAME".pid LOCKFILE=/var/lock/subsys/"$SHORTNAME" LOGFILE=/var/log/cloudstack/ipallocator/ipallocator.log http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in ---------------------------------------------------------------------- diff --git a/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in b/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in index b6720f5..ae8d215 100755 --- a/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in +++ b/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in @@ -25,7 +25,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@IPALOCATORLOG@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in ---------------------------------------------------------------------- diff --git a/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in b/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in index aa7e8cf..49fd9b6 100755 --- a/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in +++ b/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in @@ -25,7 +25,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@AGENTLOG@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in ---------------------------------------------------------------------- diff --git a/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in b/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in index 7aa456d..901d5845 100755 --- a/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in +++ b/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in @@ -32,7 +32,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@AGENTLOG@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in ---------------------------------------------------------------------- diff --git a/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in b/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in index aa7e8cf..49fd9b6 100644 --- a/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in +++ b/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in @@ -25,7 +25,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@AGENTLOG@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in ---------------------------------------------------------------------- diff --git a/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in b/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in index 7aa456d..901d5845 100755 --- a/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in +++ b/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in @@ -32,7 +32,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@AGENTLOG@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in ---------------------------------------------------------------------- diff --git a/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in b/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in index ec84962..5ec6da0 100755 --- a/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in +++ b/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in @@ -26,7 +26,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@AGENTLOG@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in ---------------------------------------------------------------------- diff --git a/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in index 76ee681..e43f641 100644 --- a/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in +++ b/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in @@ -26,7 +26,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@CPLOG@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in ---------------------------------------------------------------------- diff --git a/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in index 76ee681..e43f641 100644 --- a/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in +++ b/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in @@ -26,7 +26,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@CPLOG@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in ---------------------------------------------------------------------- diff --git a/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in index 76ee681..e43f641 100644 --- a/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in +++ b/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in @@ -26,7 +26,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@CPLOG@ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d033ca48/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in ---------------------------------------------------------------------- diff --git a/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in b/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in index c83f00a..87a653e 100755 --- a/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in +++ b/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in @@ -27,7 +27,7 @@ # set environment variables -SHORTNAME="$0" +SHORTNAME="basename $0" PIDFILE=@PIDDIR@/"$SHORTNAME".pid LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@CPLOG@
