diff --git a/dishes/live-desktop-hypervisor.cfg b/dishes/live-desktop.cfg similarity index 58% rename from dishes/live-desktop-hypervisor.cfg rename to dishes/live-desktop.cfg index f73f4fd..9f16990 100644 --- a/dishes/live-desktop-hypervisor.cfg +++ b/dishes/live-desktop.cfg @@ -19,7 +19,7 @@ rootpw --iscrypted --lock locked # SELinux configuration selinux --disabled # System services -services --enabled="NetworkManager,libvirtd" +services --enabled="NetworkManager,systemd-resolved" # System timezone timezone Europe/Paris --utc # Use network installation @@ -27,13 +27,14 @@ url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$rele # X Window System configuration information xconfig --defaultdesktop=GNOME --startxonboot # System bootloader configuration -bootloader --location=mbr --timeout=1 +bootloader --none # Clear the Master Boot Record zerombr # Partition clearing information -clearpart --all --initlabel +clearpart --all # Disk partitioning information part / --fstype="ext4" --size=5120 +part / --size=8576 %post --logfile=/mnt/sysimage/root/post.log @@ -173,123 +174,17 @@ glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/ %end -%post --nochroot --logfile=/mnt/sysimage/opt/base-desktop-gnome-virtual-machine-manager.log - -# Create a file to autostart virt-manager -cat > /mnt/sysimage/etc/xdg/autostart/virt-manager.desktop << EOF -[Desktop Entry] -Type=Application -Name=Virtual Machine Manager -Exec=virt-manager -EOF - -# Modify the default virt-manager behavior for misc. options -cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.virt-manager.virt-manager.gschema.override<< EOF - -# Modify the default virt-manager behavior for misc. options -[org.virt-manager.virt-manager] -xmleditor-enabled=true -manager-window-height=600 -manager-window-width=200 - -# Libvirt URIs listed in the manager window -[org.virt-manager.virt-manager.connections] -uris=['qemu:///system', 'qemu:///session'] -autoconnect=['qemu:///session'] - -# Show usage in the domain list -[org.virt-manager.virt-manager.vmlist-fields] -cpu-usage=false - -# Settings related to statistics -[org.virt-manager.virt-manager.stats] -update-interval=3 -enable-disk-poll=true -enable-memory-poll=true -enable-net-poll=true - -# Default behavior for the console -[org.virt-manager.virt-manager.console] -scaling=2 -resize-guest=1 -autoconnect=false - -# Do not show toolbar -[org.virt-manager.virt-manager.details] -show-toolbar=false - -# Modify default values for new VMs -[org.virt-manager.virt-manager.new-vm] -storage-format='raw' -cpu-default='host-model' -graphics-type='spice' - -# Modify the default virt-manager behavior for confirmation dialogues -[org.virt-manager.virt-manager.confirm] -forcepoweroff=false -removedev=false -unapplied-dev=false - -EOF - -glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/ - -%end - -%post --nochroot --logfile=/mnt/sysimage/opt/base-hypervisor.log - -# 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/isos # Create a directory to store iso images. SELinux is already taking this one into account. - -# wget https://boot.netboot.xyz/ipxe/netboot.xyz.iso -P /mnt/sysimage/var/lib/libvirt/isos/ # fetch netboot.xyz iso and store it to the newly created iso directory - -# # virsh commands fail in a kickstart environment (chroot or not it seems). would need to fetch a script and execute post-launch with a delay, for example using a systemd unit -# virsh pool-define-as isos dir - - - - /mnt/sysimage/var/lib/libvirt/isos/ # Make libvirt aware of this new directory by creating a so-called 'pool'. -# virsh pool-build isos # Build the pool -# virsh pool-start isos # Start it -# virsh pool-autostart isos # Set-it to autostart - -# fetch custom script and make it executable -# wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/virtualization-tweaks-root-needed.sh -P /mnt/sysimage/usr/local/bin/ -# chmod +x /mnt/sysimage/usr/local/bin/virtualization-tweaks-root-needed.sh - -# wget https://raw.githubusercontent.com/PhyllomeOS/xml-definition-for-domains/main/xml/system/linux.xml -# virsh define linux.xml - -# wget https://raw.githubusercontent.com/PhyllomeOS/xml-definition-for-domains/main/xml/system/windows.xml -# virsh define windows.xml - -%end - -%post --nochroot --logfile=/mnt/sysimage/opt/base-hypervisor-intelcpu.log - -sed -i 's/\(quiet\)/\1 intel_iommu=on iommu=pt rd.driver.pre=vfio-pci/i' /mnt/sysimage/etc/default/grub # Load kernel modules in GRUB. - -echo "options kvm_intel nested=1" >> /mnt/sysimage/etc/modprobe.d/kvm.conf # Add support for nested virtualization on Intel CPUs - -%end - -%post --nochroot --logfile=/mnt/sysimage/opt/base-hypervisor-intelgpu.log - -sed -i 's/\(vfio-pci\)/\1 i915.enable_gvt=1/i' /mnt/sysimage/etc/default/grub # Load kernel modules in grub. - -# Load extra kernel modules to enable vfio-mdev on selected hardware -echo "kvmgt" > /mnt/sysimage/etc/modules-load.d/kvmgt.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel (tm) GVT-g and Nvidia (tm) -echo "vfio-mdev" > /mnt/sysimage/etc/modules-load.d/vfio-mdev.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel (tm) GVT-g and Nvidia (tm) - -%end - %packages --exclude-weakdeps +@anaconda-tools NetworkManager NetworkManager-wifi aajohan-comfortaa-fonts alsa-sof-firmware amd-gpu-firmware +anaconda +anaconda-install-env-deps +anaconda-live +anaconda-webui atheros-firmware audit b43-fwcutter @@ -323,17 +218,6 @@ gnome-backgrounds.noarch gnome-initial-setup gnome-shell gnome-terminal -grub2-common.noarch -grub2-efi-ia32 -grub2-efi-x64 -grub2-efi-x64-cdboot -grub2-pc-modules.noarch -grub2-tools -grub2-tools-efi -grub2-tools-extra -grub2-tools-minimal -grubby -guestfs-tools hostname intel-audio-firmware intel-gpu-firmware @@ -349,11 +233,7 @@ kernel-modules kernel-modules-extra less libertas-firmware -libguestfs-tools libusb1 -libvirt -libvirt-daemon-config-network -libvirt-daemon-kvm livesys-scripts man-db mesa-dri-drivers @@ -371,8 +251,6 @@ plymouth policycoreutils prefixdevname procps-ng -python3-libguestfs -qemu-kvm realtek-firmware rootfiles rpm @@ -388,17 +266,23 @@ tiwilink-firmware usbutils util-linux vim-minimal -virt-install -virt-manager -virt-top wget2 wpa_supplicant zram-generator-defaults +-@dial-up +-@input-methods +-@standard +-device-mapper-multipath +-fcoe-utils -fedora-logos -fedora-release -fedora-release-common -fedora-release-identity-basic -fedora-release-notes +-gfs2-utils -gnome-tour +-python3-botocore +-reiserfs-utils +-sdubby %end diff --git a/ingredients/live-core-mandatory-packages.cfg b/ingredients/live-core-mandatory-packages.cfg index bdb65ba..e7d96b4 100644 --- a/ingredients/live-core-mandatory-packages.cfg +++ b/ingredients/live-core-mandatory-packages.cfg @@ -9,16 +9,25 @@ %packages --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies. Description courtesy of the Fedora project -grub2-common.noarch -grub2-efi-ia32 -grub2-efi-x64 -grub2-efi-x64-cdboot -grub2-pc-modules.noarch -grub2-tools -grub2-tools-efi -grub2-tools-extra -grub2-tools-minimal -grubby +@anaconda-tools +anaconda +anaconda-install-env-deps +anaconda-live +anaconda-webui +glibc-all-langpacks +kernel +kernel-modules +kernel-modules-extra +livesys-scripts +-@dial-up +-@input-methods +-@standard +-device-mapper-multipath +-fcoe-utils +-gfs2-utils +-python3-botocore +-reiserfs-utils +-sdubby # Explicitly specified here: # walters: because otherwise dependency loops cause yum issues. @@ -37,4 +46,5 @@ glibc-all-langpacks # provide the livesys scripts livesys-scripts + %end \ No newline at end of file