You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2012/07/26 23:05:07 UTC
[35/50] git commit: Fix for the Ubuntu Agent init script.
Fix for the Ubuntu Agent init script.
The last commit didn't use some tokens, revert that
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8dfaa76d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8dfaa76d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8dfaa76d
Branch: refs/heads/rbd
Commit: 8dfaa76d87c26aa7bf26968b5b047e835c7c0343
Parents: b7d4e54
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Tue Jul 24 23:56:08 2012 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Tue Jul 24 23:56:08 2012 +0200
----------------------------------------------------------------------
.../distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8dfaa76d/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in
----------------------------------------------------------------------
diff --git a/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in b/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in
index e2bbdb6..4f6f04d 100755
--- a/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in
+++ b/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in
@@ -36,14 +36,14 @@ whatami=cloud-agent
# set environment variables
SHORTNAME="$whatami"
-PIDFILE=/var/run/"$whatami".pid
-LOCKFILE=/var/lock/subsys/"$SHORTNAME"
-LOGFILE=/var/log/cloud/agent/agent.log
+PIDFILE=@PIDDIR@/"$whatami".pid
+LOCKFILE=@LOCKDIR@/"$SHORTNAME"
+LOGFILE=@AGENTLOG@
PROGNAME="Cloud Agent"
CLASS="com.cloud.agent.AgentShell"
unset OPTIONS
-[ -r /etc/default/"$SHORTNAME" ] && source /etc/default/"$SHORTNAME"
+[ -r @SYSCONFDIR@/default/"$SHORTNAME" ] && source @SYSCONFDIR@/default/"$SHORTNAME"
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"