Skip to content

Commit bbb8e70

Browse files
committed
xenserver: fix xenstore-read path in cloud-early-config
This fixes incorrect xenstore-read binary path, this failed systemvm to be patched/started correctly on xenserver. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent 38cfe53 commit bbb8e70

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

systemvm/debian/opt/cloud/bin/setup/cloud-early-config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ get_boot_params() {
7676
sed -i "s/%/ /g" $CMDLINE
7777
;;
7878
xen-hvm)
79-
if [ ! -f /usr/sbin/xenstore-read ]; then
79+
if [ ! -f /usr/bin/xenstore-read ]; then
8080
log_it "ERROR: xentools not installed, cannot found xenstore-read" && exit 5
8181
fi
82-
/usr/sbin/xenstore-read vm-data/cloudstack/init > /var/cache/cloud/cmdline
83-
sed -i "s/%/ /g" /var/cache/cloud/cmdline
82+
/usr/bin/xenstore-read vm-data/cloudstack/init > $CMDLINE
83+
sed -i "s/%/ /g" $CMDLINE
8484
;;
8585
kvm)
8686
VPORT=$(find /dev/virtio-ports -type l -name '*.vport' 2>/dev/null|head -1)

tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ function install_packages() {
8686
fi
8787

8888
# Install xenserver guest utilities as debian repos don't have it
89-
wget https://mirrors.kernel.org/ubuntu/pool/universe/x/xe-guest-utilities/xe-guest-utilities_7.4.0-0ubuntu1_amd64.deb
90-
dpkg -i xe-guest-utilities_7.4.0-0ubuntu1_amd64.deb
91-
rm -f xe-guest-utilities_7.4.0-0ubuntu1_amd64.deb
89+
wget https://mirrors.kernel.org/ubuntu/pool/main/x/xe-guest-utilities/xe-guest-utilities_7.10.0-0ubuntu1_amd64.deb
90+
dpkg -i xe-guest-utilities_7.10.0-0ubuntu1_amd64.deb
91+
rm -f xe-guest-utilities_7.10.0-0ubuntu1_amd64.deb
9292
}
9393

9494
return 2>/dev/null || install_packages

0 commit comments

Comments
 (0)