diff --git a/systemvm/debian/opt/cloud/bin/setup/cloud-early-config b/systemvm/debian/opt/cloud/bin/setup/cloud-early-config index a9ad094c8cb..9baed018b7f 100755 --- a/systemvm/debian/opt/cloud/bin/setup/cloud-early-config +++ b/systemvm/debian/opt/cloud/bin/setup/cloud-early-config @@ -71,16 +71,16 @@ config_guest() { get_boot_params() { case $HYPERVISOR in - xen-pv) + xen-pv|xen-domU) cat /proc/cmdline > $CMDLINE sed -i "s/%/ /g" $CMDLINE ;; xen-hvm) - if [ ! -f /usr/sbin/xenstore-read ]; then + if [ ! -f /usr/bin/xenstore-read ]; then log_it "ERROR: xentools not installed, cannot found xenstore-read" && exit 5 fi - /usr/sbin/xenstore-read vm-data/cloudstack/init > /var/cache/cloud/cmdline - sed -i "s/%/ /g" /var/cache/cloud/cmdline + /usr/bin/xenstore-read vm-data/cloudstack/init > $CMDLINE + sed -i "s/%/ /g" $CMDLINE ;; kvm) VPORT=$(find /dev/virtio-ports -type l -name '*.vport' 2>/dev/null|head -1) diff --git a/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh b/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh index a5b1379b20a..c1c3e94e0a8 100644 --- a/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh +++ b/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh @@ -86,9 +86,9 @@ function install_packages() { fi # Install xenserver guest utilities as debian repos don't have it - wget https://mirrors.kernel.org/ubuntu/pool/universe/x/xe-guest-utilities/xe-guest-utilities_7.4.0-0ubuntu1_amd64.deb - dpkg -i xe-guest-utilities_7.4.0-0ubuntu1_amd64.deb - rm -f xe-guest-utilities_7.4.0-0ubuntu1_amd64.deb + 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