From 8dfaa76d87c26aa7bf26968b5b047e835c7c0343 Mon Sep 17 00:00:00 2001 From: Wido den Hollander Date: Tue, 24 Jul 2012 23:56:08 +0200 Subject: [PATCH] Fix for the Ubuntu Agent init script. The last commit didn't use some tokens, revert that --- agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in b/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in index e2bbdb68a79..4f6f04dd4d7 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"