[cloudstack] 11/18: switch rng-tools for haveged (better for cloud instances) and use repo version of xen-tools instead of outdated version

[pa...@apache.org]

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 5e0fad00f8f56218ea87a50401ac4529f14ccf65
Author: Paul Angus <pa...@shapeblue.com>
AuthorDate: Wed Dec 5 14:59:28 2018 +0000

    switch rng-tools for haveged (better for cloud instances) and use repo version of xen-tools instead of outdated version
---
 .../systemvmtemplate/scripts/install_systemvm_packages.sh    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh b/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh
index 72eed8b..ab83ee2 100644
--- a/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh
+++ b/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh
@@ -70,8 +70,8 @@ function install_packages() {
     radvd \
     sharutils genisoimage \
     strongswan libcharon-extra-plugins libstrongswan-extra-plugins \
-    virt-what open-vm-tools qemu-guest-agent hyperv-daemons \
-    rng-tools
+    virt-what open-vm-tools qemu-guest-agent hyperv-daemons xen-tools\
+    haveged
 
   apt-get -q -y -t stretch-backports install nftables
 
@@ -88,10 +88,10 @@ function install_packages() {
     ${apt_get} install libuuid1:i386 libc6:i386
   fi
 
-  # Install xenserver guest utilities as debian repos don't have it
-  wget https://mirrors.kernel.org/ubuntu/pool/main/x/xe-guest-utilities/xe-guest-utilities_7.10.0-0ubuntu1_amd64.deb
-  dpkg -i xe-guest-utilities_7.10.0-0ubuntu1_amd64.deb
-  rm -f xe-guest-utilities_7.10.0-0ubuntu1_amd64.deb
+  # Install xenserver guest utilities as debian repos don't have it - commented temporarily then will be removed as debian9 repos have much later xen-tools
+  # wget https://mirrors.kernel.org/ubuntu/pool/main/x/xe-guest-utilities/xe-guest-utilities_7.10.0-0ubuntu1_amd64.deb
+  # dpkg -i xe-guest-utilities_7.10.0-0ubuntu1_amd64.deb
+  # rm -f xe-guest-utilities_7.10.0-0ubuntu1_amd64.deb
 }
 
 return 2>/dev/null || install_packages