Github user rhtyd commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1647#discussion_r76284726
--- Diff: debian/rules ---
@@ -35,13 +37,20 @@ override_dh_auto_install:
# cloudstack-agent
mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/agent
mkdir $(DESTDIR)/$(SYSCONFDIR)/profile.d
- mkdir $(DESTDIR)/var/log/$(PACKAGE)/agent
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent/plugins
install -D agent/target/cloud-agent-$(VERSION).jar
$(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/$(PACKAGE)-agent.jar
install -D
plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-$(VERSION).jar
$(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
install -D plugins/hypervisors/kvm/target/dependencies/*
$(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
- install -D packaging/debian/init/cloud-agent
$(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-agent
+
+ install -m0755 packaging/debian/$(PACKAGE)-agent.init
$(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-agent
+ install -d -m0755 debian/$(PACKAGE)-agent/lib/systemd/system
+ # Fix libvirt service name for Debian/Ubuntu
+ sed -i 's/Requires=libvirtd.service/Requires=libvirt-bin.service/g'
packaging/systemd/$(PACKAGE)-agent.service
+ sed -i 's/After=libvirtd.service/After=libvirt-bin.service/g'
packaging/systemd/$(PACKAGE)-agent.service
+ install -m0644 packaging/systemd/$(PACKAGE)-agent.service
debian/$(PACKAGE)-agent/lib/systemd/system/$(PACKAGE)-agent.service
+ install -m0644 packaging/systemd/$(PACKAGE)-agent.default
$(DESTDIR)/$(SYSCONFDIR)/default/$(PACKAGE)-agent
--- End diff --
This has one issue if there is no /usr/lib/jvm/default-java installed on
either Ubuntu 14.04/16.04 using the default repositories. I've reverted using
the readlink solution now. Thanks.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
