WIP: Attempt to make cloud-init work with mkosi based on Magnus' inve…

…stigations
confidential-containers · Nov 25, 2024 · 7d148fe · 7d148fe
1 parent e6afdfd
commit 7d148fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...d-api-adaptor/podvm-mkosi/mkosi.skeleton/usr/lib/systemd/system-preset/20-coco-sys.preset b/...d-api-adaptor/podvm-mkosi/mkosi.skeleton/usr/lib/systemd/system-preset/20-coco-sys.preset
@@ -3,6 +3,7 @@ enable systemd-networkd.socket
 enable systemd-resolved.service
 enable dbus.service
 enable afterburn-checkin.service
+enable cloud-init.service
 
 # For debug images.
 # This units are not part of the production image.

diff --git a/src/cloud-providers/libvirt/libvirt.go b/src/cloud-providers/libvirt/libvirt.go
@@ -366,7 +366,7 @@ func createDomainXMLx86_64(client *libvirtClient, cfg *domainConfig, vm *vmConfi
 					Source: &libvirtxml.DomainDiskSource{
 						File: &libvirtxml.DomainDiskSourceFile{File: cfg.cidataDisk},
 					},
-					Target:   &libvirtxml.DomainDiskTarget{Dev: "hda", Bus: "ide"},
+					Target:   &libvirtxml.DomainDiskTarget{Dev: "sdb", Bus: "scsi"},
 					ReadOnly: &libvirtxml.DomainDiskReadOnly{},
 					Address: &libvirtxml.DomainAddress{
 						Drive: &libvirtxml.DomainAddressDrive{