Skip to content

Commit 5bf6771

Browse files
committed
Summary: packaging updates
Renamed a whole bunch of stuff from cloud to cloudstack Fix startup of cloudstack-agent
1 parent 2527302 commit 5bf6771

3 files changed

Lines changed: 164 additions & 133 deletions

File tree

packaging/centos63/cloud-agent.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424

2525
. /etc/rc.d/init.d/functions
2626

27-
whatami=cloud-agent
27+
whatami=cloudstack-agent
2828

2929
# set environment variables
3030

3131
SHORTNAME="$whatami"
3232
PIDFILE=/var/run/"$whatami".pid
3333
LOCKFILE=/var/lock/subsys/"$SHORTNAME"
34-
LOGFILE=/var/log/cloud/agent/agent.log
34+
LOGFILE=/var/log/cloudstack/agent/agent.log
3535
PROGNAME="Cloud Agent"
3636
CLASS="com.cloud.agent.AgentShell"
3737
JSVC=`which jsvc 2>/dev/null`;
@@ -57,12 +57,12 @@ export JAVA_HOME
5757

5858
SCP=""
5959
DCP=""
60-
ACP=`ls /usr/share/cloud/java/* | tr '\n' ':'`
60+
ACP=`ls /usr/share/cloudstack-agent/cloud-plugin-hypervisor-kvm-*.jar`":"`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':'`
6161
JCP="/usr/share/java/jna.jar:/usr/share/java/commons-daemon.jar"
6262

6363
# We need to append the JSVC daemon JAR to the classpath
6464
# AgentShell implements the JSVC daemon methods
65-
export CLASSPATH="$SCP:$DCP:$ACP:$JCP:/etc/cloud/agent:/usr/lib64/cloud/agent"
65+
export CLASSPATH="$SCP:$DCP:$ACP:$JCP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts"
6666

6767
start() {
6868
echo -n $"Starting $PROGNAME: "

0 commit comments

Comments
 (0)