You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2014/03/11 20:05:41 UTC

[02/13] git commit: updated refs/heads/resize-root to dd4f6bf

CLOUDSTACK-6220: Take 2, 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/a4d3ec47
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a4d3ec47
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a4d3ec47

Branch: refs/heads/resize-root
Commit: a4d3ec476fce815ef32e8273c7311850b5617f06
Parents: d033ca4
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Mon Mar 10 16:11:04 2014 -0600
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Mon Mar 10 16:11:52 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/a4d3ec47/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 704ef6b..d1769cc 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d3ec47/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 704ef6b..d1769cc 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d3ec47/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 e684888..741317b 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d3ec47/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 704ef6b..d1769cc 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d3ec47/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 e684888..741317b 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d3ec47/packaging/centos63/cloud-agent.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc
index af1c624..ece4c27 100755
--- a/packaging/centos63/cloud-agent.rc
+++ b/packaging/centos63/cloud-agent.rc
@@ -26,7 +26,7 @@
 
 # set environment variables
 
-SHORTNAME="basename $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/a4d3ec47/packaging/centos63/cloud-ipallocator.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-ipallocator.rc b/packaging/centos63/cloud-ipallocator.rc
index 9d1adb4..d26287d 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 $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/a4d3ec47/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 ae8d215..3921484 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@IPALOCATORLOG@

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d3ec47/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 49fd9b6..23ec8f3 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d3ec47/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 901d5845..558f5a2 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d3ec47/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 49fd9b6..23ec8f3 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d3ec47/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 901d5845..558f5a2 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d3ec47/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 5ec6da0..e2cb361 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d3ec47/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 e43f641..3ec4d06 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@CPLOG@

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d3ec47/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 e43f641..3ec4d06 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@CPLOG@

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d3ec47/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 e43f641..3ec4d06 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@CPLOG@

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4d3ec47/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 87a653e..0c7be73 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="basename $0"
+SHORTNAME=`basename $0`
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@CPLOG@