WIP: DO NOT MERGE: Enable cloud-init for x86 for libivrt

confidential-containers · Nov 15, 2024 · c50fe13 · c50fe13
1 parent 97a3c5b
commit c50fe13
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/system/mkosi.conf.d/fedora.conf b/src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/system/mkosi.conf.d/fedora.conf
@@ -23,6 +23,7 @@ Packages=
     iptables
     afterburn
     neofetch
+    cloud-init
 
 RemoveFiles=/etc/issue
 RemoveFiles=/etc/issue.net

diff --git a/src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/system/mkosi.finalize.chroot b/src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/system/mkosi.finalize.chroot
@@ -2,13 +2,11 @@
 
 set -euxo pipefail
 
-if [[ "${ARCHITECTURE}" == "s390x" ]]; then
-	# enable cloud-init services
-        systemctl enable cloud-init-local.service
-        systemctl enable cloud-init.service
-        systemctl enable cloud-config.service
-        systemctl enable cloud-final.service
+# enable cloud-init services
+systemctl enable cloud-init-local.service
+systemctl enable cloud-init.service
+systemctl enable cloud-config.service
+systemctl enable cloud-final.service
 
-	# disable this service since we already have "NetworkManager-wait-online.service"
-        systemctl disable systemd-networkd-wait-online.service
-fi
+# disable this service since we already have "NetworkManager-wait-online.service"
+systemctl disable systemd-networkd-wait-online.service