You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pa...@apache.org on 2018/12/12 22:11:50 UTC
[cloudstack] 17/18: Merge branch '41120-memory' of
https://github.com/ShapeBlue/cloudstack into 41120-memory
This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a commit to branch 41120-memory
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 2183212dcdc6990c717cee5db3546164ec4663b7
Merge: 2a10fc1 198efd4
Author: Paul Angus <pa...@shapeblue.com>
AuthorDate: Sun Dec 9 17:03:34 2018 +0000
Merge branch '41120-memory' of https://github.com/ShapeBlue/cloudstack into 41120-memory
# Conflicts:
# tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
.../appliance/systemvmtemplate/scripts/configure_systemvm_services.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --cc tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
index 0d3defd,b7614e3..386a4a9
--- a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
+++ b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
@@@ -111,8 -111,11 +111,7 @@@ function configure_services()
systemctl disable vgauth
# Disable guest services which will selectively be started based on hypervisor
- systemctl disable open-vm-tools xe-daemon hyperv-daemons.hv-fcopy-daemon.service hyperv-daemons.hv-kvp-daemon.service hyperv-daemons.hv-vss-daemon.service qemu-guest-agent
- /lib/systemd/systemd-sysv-install disable
- systemctl disable open-vm-tools || true
- systemctl disable hyperv-daemons || true
- systemctl disable xenstored || true
- systemctl disable xe-daemon || true
- /lib/systemd/systemd-sysv-install disable qemu-guest-agent || true
++ systemctl disable open-vm-tools xe-daemon hyperv-daemons.hv-fcopy-daemon.service hyperv-daemons.hv-kvp-daemon.service hyperv-daemons.hv-vss-daemon.service qemu-guest-agent || true
configure_apache2
configure_strongswan