restore ubuntu machine type

The permanent vm machine type must be preserved so the guest variant will have the right variant restriction but the version controlled machine type will be updated at the vms (and should not affect the entire guest OS configuraiton scope). TODO: Squash down.
intra2net · Jan 27, 2025 · 9dbd31e · 9dbd31e
1 parent c80c521
commit 9dbd31e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/tp_folder/configs/guest-os.cfg b/tp_folder/configs/guest-os.cfg
@@ -228,7 +228,6 @@ variants:
                                     floppy_name = images/rhel80-64/ks.vfd
 
             - Ubuntu:
-                machine_type = pc-i440fx-5.1
                 grub_file = /boot/grub/grub.cfg
                 shell_prompt = "^.*@.*[\#\$]\s*$"
                 password = test1234

diff --git a/tp_folder/configs/guest.cfg b/tp_folder/configs/guest.cfg
@@ -40,7 +40,7 @@ variants:
 
     # Runs our standard vm configuration for an Ubuntu machine
     - @qemu_kvm_ubuntu:
-        only q35
+        only i440fx
         only virtio_net
         only smp2
         only virtio_blk

diff --git a/tp_folder/configs/vms.cfg b/tp_folder/configs/vms.cfg
@@ -108,6 +108,7 @@ variants:
         permanent_vm = yes
         images_base_dir += vm3/
         # software and hardware restrictions
+        machine_type = pc-i440fx-5.1
         only qemu_kvm_ubuntu, qemu_kvm_kali
         suffix _vm3