From 3d1f3a9007dbd4ea29c9a27c44f92b8840daf981 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mprokop@sipwise.com>
Date: Tue, 11 Jun 2024 17:07:41 +0200
Subject: [PATCH] MT#60284 Ensure to start qemu-guest-agent only after package
got installed
We install the qemu-guest-agent package in ensure_packages_installed().
Try to start the qemu-guest-agent service only afterwards therefore.
Fixup for commit 82e6638b40a
Change-Id: Ic4aa2e493851b4c92ac134d68a9a76e05485658d
(cherry picked from commit cf94193f8898a87b89d92c398e217b7cb91d8568)
---
templates/scripts/includes/deployment.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/templates/scripts/includes/deployment.sh b/templates/scripts/includes/deployment.sh
index d529174..e25d50d 100755
--- a/templates/scripts/includes/deployment.sh
+++ b/templates/scripts/includes/deployment.sh
@@ -1420,12 +1420,6 @@ trap 'wait_exit;' 1 2 3 6 15 ERR EXIT
echo "Host IP: $(ip-screen)"
echo "Deployment version: $SCRIPT_VERSION"
-# MT#60284 ensure qemu-guest-agent is running if it's available in VM
-if [ -e /dev/virtio-ports/org.qemu.guest_agent.0 ] ; then
- echo "Guest Agent VirtIO device detected, starting qemu-guest-agent service"
- systemctl start qemu-guest-agent
-fi
-
enable_deploy_status_server
set_deploy_status "checkBootParam"
@@ -1716,6 +1710,12 @@ fi
ensure_packages_installed
+# MT#60284 ensure qemu-guest-agent is running if it's available in VM
+if [ -e /dev/virtio-ports/org.qemu.guest_agent.0 ] ; then
+ echo "Guest Agent VirtIO device detected, starting qemu-guest-agent service"
+ systemctl start qemu-guest-agent
+fi
+
# this is important for "buster", do not update the string for "bullseye" or
# future releases
case "${DEBIAN_RELEASE}" in