From f5f86be1bf762e80e0f046a0dad998255c752bfb Mon Sep 17 00:00:00 2001 From: Lukas Date: Fri, 23 Jul 2021 11:21:08 +0200 Subject: [PATCH] comment out most elements for hypervisors ks --- leaves/vhamd.cfg | 4 ++-- leaves/vhimd.cfg | 6 +++--- leaves/vhmd.cfg | 42 +++++++++++++++++++++--------------------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/leaves/vhamd.cfg b/leaves/vhamd.cfg index 681edd8..2073a8b 100644 --- a/leaves/vhamd.cfg +++ b/leaves/vhamd.cfg @@ -19,9 +19,9 @@ %post # Beginning of %post section # Load kernel modules in grub. -sed -i 's/\(quiet\)/\1 amd_iommu=on amd_iommu=pt rd.driver.pre=vfio-pci/i' /etc/default/grub +# sed -i 's/\(quiet\)/\1 amd_iommu=on amd_iommu=pt rd.driver.pre=vfio-pci/i' /etc/default/grub # dracut --force # Regenerate initramfs # grub2-mkconfig -o /boot/grub2/grub.cfg # Update grub -%end # End of the %post section +%end # End of the %post section \ No newline at end of file diff --git a/leaves/vhimd.cfg b/leaves/vhimd.cfg index 2ce32e3..f9e94ec 100644 --- a/leaves/vhimd.cfg +++ b/leaves/vhimd.cfg @@ -19,9 +19,9 @@ %post # Beginning of %post section # Load kernel modules in grub. Add `intel_iommu=on intel_iommu=pt` for Intel processors, -sed -i 's/\(quiet\)/\1 intel_iommu=on iommu=pt rd.driver.pre=vfio-pci i915.enable_gvt=1/i' /etc/default/grub -echo "kvmgt" > /etc/modules-load.d/kvmgt.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel GVT-g and Nvidia -echo "vfio-mdev" > /etc/modules-load.d/vfio-mdev.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel GVT-g and Nvidia +# sed -i 's/\(quiet\)/\1 intel_iommu=on iommu=pt rd.driver.pre=vfio-pci i915.enable_gvt=1/i' /etc/default/grub +# echo "kvmgt" > /etc/modules-load.d/kvmgt.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel GVT-g and Nvidia +# echo "vfio-mdev" > /etc/modules-load.d/vfio-mdev.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel GVT-g and Nvidia # dracut --force # Regenerate initramfs # grub2-mkconfig -o /boot/grub2/grub.cfg # Update grub diff --git a/leaves/vhmd.cfg b/leaves/vhmd.cfg index ec0e3a3..2ce85de 100644 --- a/leaves/vhmd.cfg +++ b/leaves/vhmd.cfg @@ -6,7 +6,7 @@ # /_/ /____/ # What ? This kickstart file provides the base configuration for an hypervisor. -# It is meant to be used together with vhidmd (Intel-based system) vhamd (AMD-based system) +# It is meant to be used alongside vhimd (Intel-based system) or vhamd (AMD-based system) # 'v' for virtual machine, 'm' for minimal, 'h' for hypervisor, 'd' for development only. %include https://git.phyllo.me/home/kickstart/raw/branch/master/leafs/vmd.cfg # Includes vemdd.cfg, the minimal GNOME-based desktop-oriented virtual machine ks file. @@ -16,26 +16,26 @@ dnf install -y qemu-kvm libvirt libvirt-daemon-config-network libvirt-daemon-kvm # Install minimal tools dedicated to virtualization. dnf install -y virt-install virt-top libguestfs-tools python3-libguestfs guestfs-tools # Complementary tools useful for interacting with virtual machines. -usermod -a -G libvirt test ## make user "test" part of the existing libvirt group to allow it to interact with the nested-hypervisor. +# usermod -a -G libvirt test ## make user "test" part of the existing libvirt group to allow it to interact with the nested-hypervisor. +# +# # Load kernel modules by adding vfio, vfio_pci, vfio_iommu_type1, vfio_virqfd, kvmgt, vfio-mdev +# echo "vfio" > /etc/modules-load.d/vfio.conf +# echo "vfio-pci" > /etc/modules-load.d/vfio-pci.conf +# echo "vfio_iommu_type1" > /etc/modules-load.d/vfio_iommu_type1.conf +# echo "vfio_virqfd" > /etc/modules-load.d/vfio_virqfd.conf +# +# dracut --add-drivers "vfio vfio-pci vfio_iommu_type1 vfio_virqfd" --force # Instruct dracut to load the vfio drivers: -# Load kernel modules by adding vfio, vfio_pci, vfio_iommu_type1, vfio_virqfd, kvmgt, vfio-mdev -echo "vfio" > /etc/modules-load.d/vfio.conf -echo "vfio-pci" > /etc/modules-load.d/vfio-pci.conf -echo "vfio_iommu_type1" > /etc/modules-load.d/vfio_iommu_type1.conf -echo "vfio_virqfd" > /etc/modules-load.d/vfio_virqfd.conf - -dracut --add-drivers "vfio vfio-pci vfio_iommu_type1 vfio_virqfd" --force # Instruct dracut to load the vfio drivers: - -mkdir /var/lib/libvirt/iso # Create a directory to store iso images -chown test:test /var/lib/libvirt/iso # Make the user "test" the owner of this directory -virsh pool-create-as --name iso --type dir --target /var/lib/libvirt/iso # Make libvirt aware of this new directory by creating a so-called `pool` within this directory -mkdir /var/lib/libvirt/rom # Create a directory to store rom files -chown test:test /var/lib/libvirt/rom # Make the user "test" its owner -virsh pool-create-as --name iso --type dir --target /var/lib/libvirt/rom # Make libvirt aware of this new directory by creating a so-called `pool` within this directory -chown test:test /var/lib/libvirt/images # Make the user "test" the owner of this directory - -nmcli con add ifname br0 type bridge con-name br0 # Add a network bridge -nmcli con add type bridge-slave ifname enp1s0 master br0 -nmcli con up br0 +# mkdir /var/lib/libvirt/iso # Create a directory to store iso images +# chown test:test /var/lib/libvirt/iso # Make the user "test" the owner of this directory +# virsh pool-create-as --name iso --type dir --target /var/lib/libvirt/iso # Make libvirt aware of this new directory by creating a so-called `pool` within this directory +# mkdir /var/lib/libvirt/rom # Create a directory to store rom files +# chown test:test /var/lib/libvirt/rom # Make the user "test" its owner +# virsh pool-create-as --name rom --type dir --target /var/lib/libvirt/rom # Make libvirt aware of this new directory by creating a so-called `pool` within this directory +# chown test:test /var/lib/libvirt/images # Make the user "test" the owner of this directory +# +# nmcli con add ifname br0 type bridge con-name br0 # Add a network bridge +# nmcli con add type bridge-slave ifname enp1s0 master br0 +# nmcli con up br0 %end # End of the %post section \ No newline at end of file