Updated Branches: refs/heads/4.1 ccd746027 -> df8189883
CLOUDSTACK-1469: Include JNA in the classpath when starting the Agent This should have been already merged into 4.1, but didn't come through properly. We use the JNA version shipped with CentOS 6.X since that works best with libvirt 0.4.9 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/df818988 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/df818988 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/df818988 Branch: refs/heads/4.1 Commit: df81898838caf427e719a7706ecd953cb97834c7 Parents: ccd7460 Author: Wido den Hollander <[email protected]> Authored: Wed Mar 20 15:52:14 2013 +0100 Committer: Wido den Hollander <[email protected]> Committed: Wed Mar 20 15:52:14 2013 +0100 ---------------------------------------------------------------------- packaging/centos63/cloud-agent.rc | 5 +++-- packaging/centos63/cloud.spec | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/df818988/packaging/centos63/cloud-agent.rc ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc index 152e61e..fe19da4 100755 --- a/packaging/centos63/cloud-agent.rc +++ b/packaging/centos63/cloud-agent.rc @@ -58,11 +58,12 @@ export JAVA_HOME SCP="" DCP="" -ACP=`ls /usr/share/cloudstack-agent/cloud-plugin-hypervisor-kvm-*.jar`":"`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':'` -JCP="/usr/share/java/commons-daemon.jar" +ACP=`ls /usr/share/cloudstack-agent/cloud-plugin-hypervisor-kvm-*.jar`":"`ls /usr/share/cloudstack-agent/lib/*.jar | tr '\n' ':' | sed s'/.$//'` +JCP="/usr/share/java/commons-daemon.jar:/usr/share/java/jna.jar" # We need to append the JSVC daemon JAR to the classpath # AgentShell implements the JSVC daemon methods +# We also need JNA in the classpath (from the distribution) for the Libvirt Java bindings export CLASSPATH="$SCP:$DCP:$ACP:$JCP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts" start() { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/df818988/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 7bcfa24..b4aa519 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -109,6 +109,7 @@ The Apache CloudStack files shared between agent and management server %package agent Summary: CloudStack Agent for KVM hypervisors Requires: java >= 1.6.0 +Requires: jna >= 3.2.4 Requires: %{name}-common = %{_ver} Requires: libvirt Requires: bridge-utils
