From 4306686384cdcd1afa6ecf85c4e1df3465f54319 Mon Sep 17 00:00:00 2001
From: binary <me@rgoncalves.se>
Date: Sat, 21 Nov 2020 16:24:49 +0100
Subject: Switch to virt kernel and check for cpu microcode.

---
 roles/bhyve/tasks/main.yml           | 1 +
 roles/bhyve/templates/alpine.conf.j2 | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'roles/bhyve')

diff --git a/roles/bhyve/tasks/main.yml b/roles/bhyve/tasks/main.yml
index 3c1cadf..3ff902a 100644
--- a/roles/bhyve/tasks/main.yml
+++ b/roles/bhyve/tasks/main.yml
@@ -34,6 +34,7 @@
     - vm-bhyve
     - bhyve-firmware
     - grub2-bhyve
+    - devcpu-data
 
 - name: enable bhyve vm
   shell: |
diff --git a/roles/bhyve/templates/alpine.conf.j2 b/roles/bhyve/templates/alpine.conf.j2
index 58cad66..9baf5c2 100644
--- a/roles/bhyve/templates/alpine.conf.j2
+++ b/roles/bhyve/templates/alpine.conf.j2
@@ -8,7 +8,7 @@ network0_switch="{{ guest_switch }}"
 disk0_type="virtio-blk"
 disk0_name="disk0.img"
 
-grub_install0="linux /boot/vmlinuz-lts initrd=/boot/initramfs-lts alpine_dev=cdrom:iso9660 modules=loop,squashfs,sd-mod,usb-storage,sr-mod"
-grub_install1="initrd /boot/initramfs-lts"
-grub_run0="linux /boot/vmlinuz-lts root=/dev/vda3 modules=ext4"
-grub_run1="initrd /boot/initramfs-lts"
+grub_install0="linux /boot/vmlinuz-virt initrd=/boot/initramfs-virt alpine_dev=cdrom:iso9660 modules=loop,squashfs,sd-mod,usb-storage,sr-mod"
+grub_install1="initrd /boot/initramfs-virt"
+grub_run0="linux /boot/vmlinuz-virt root=/dev/vda3 modules=ext4"
+grub_run1="initrd /boot/initramfs-virt"
-- 
cgit v1.2.3