Move containerd disable to post-install

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: awesomenix

vhdbuilder/packer/cleanup-vhd.sh

@@ -1,5 +1,8 @@
 #!/bin/bash -eux
 
+systemctl daemon-reload
+systemctl disable --now containerd || exit 1
+
 # Cleanup packer SSH key and machine ID generated for this boot
 rm -f /root/.ssh/authorized_keys
 rm -f /home/packer/.ssh/authorized_keys

vhdbuilder/packer/install-dependencies.sh

@@ -149,8 +149,6 @@ tee "${CONTAINERD_SERVICE_DIR}/exec_start.conf" > /dev/null <<EOF
 ExecStartPost=/sbin/iptables -P FORWARD ACCEPT
 EOF
 
-systemctl disable --now containerd
-
 tee "/etc/sysctl.d/99-force-bridge-forward.conf" > /dev/null <<EOF
 net.ipv4.ip_forward = 1
 net.ipv4.conf.all.forwarding = 1

vhdbuilder/packer/post-install-dependencies.sh

@@ -106,6 +106,7 @@ if [ $OS = $UBUNTU_OS_NAME ]; then
   fi
 fi
 capture_benchmark "${SCRIPT_NAME}_resolve_conf"
+
 echo "post-install-dependencies step completed successfully"
 capture_benchmark "${SCRIPT_NAME}_overall" true
 process_benchmarks