diff --git a/blocks/base-hypervisor-a.cfg b/blocks/base-hypervisor-a.cfg index 46e3415..1fa4537 100644 --- a/blocks/base-hypervisor-a.cfg +++ b/blocks/base-hypervisor-a.cfg @@ -13,12 +13,6 @@ services --enabled="NetworkManager,libvirtd" sed -i 's/\(quiet\)/\1 amd_iommu=on amd_iommu=pt rd.driver.pre=vfio-pci/i' /mnt/sysimage/etc/default/grub # Load kernel modules in GRUB. -# Load kernel modules by adding vfio, vfio_pci, vfio_iommu_type1, vfio_virqfd -echo "vfio" > /mnt/sysimage/etc/modules-load.d/vfio.conf -echo "vfio-pci" > /mnt/sysimage/etc/modules-load.d/vfio-pci.conf -echo "vfio_iommu_type1" > /mnt/sysimage/etc/modules-load.d/vfio_iommu_type1.conf -echo "vfio_virqfd" > /mnt/sysimage/etc/modules-load.d/vfio_virqfd.conf - echo "options kvm_amd nested=1" >> /etc/modprobe.d/kvm.conf # Add support for nested-virtualization # The following part seems useless diff --git a/blocks/base-hypervisor.cfg b/blocks/base-hypervisor.cfg index 0b64eea..57ff569 100644 --- a/blocks/base-hypervisor.cfg +++ b/blocks/base-hypervisor.cfg @@ -26,6 +26,12 @@ guestfs-tools # Complementary tools useful for interacting with vith guest syste %post --nochroot --log=/mnt/sysimage/root/bh.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting # %post --log=/root/bh.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting +# Load kernel modules by adding vfio, vfio_pci, vfio_iommu_type1, vfio_virqfd +echo "vfio" > /mnt/sysimage/etc/modules-load.d/vfio.conf +echo "vfio-pci" > /mnt/sysimage/etc/modules-load.d/vfio-pci.conf +echo "vfio_iommu_type1" > /mnt/sysimage/etc/modules-load.d/vfio_iommu_type1.conf +echo "vfio_virqfd" > /mnt/sysimage/etc/modules-load.d/vfio_virqfd.conf + mkdir /mnt/sysimage/var/lib/libvirt/iso # Create a directory to store iso images wget https://boot.netboot.xyz/ipxe/netboot.xyz.iso -P /mnt/sysimage/var/lib/libvirt/iso/ # fetch netboot.xyz iso @@ -35,8 +41,8 @@ wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post/configure chmod +x /mnt/sysimage/usr/sbin/configure-vmm-and-desktop.sh # fetch custom script and make it executable -wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post/create-live-vm.sh -P /mnt/sysimage/usr/sbin/ -chmod +x /mnt/sysimage/usr/sbin/create-live-vm.sh +wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post/create-user-vms.sh -P /mnt/sysimage/usr/sbin/ +chmod +x /mnt/sysimage/usr/sbin/create-user-vms.sh # fetch custom script and make it executable wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post/virtualization-tweaks-root-needed.sh -P /mnt/sysimage/usr/sbin/