diff --git a/dishes/phyllome-desktop-amdcpu.cfg b/dishes/phyllome-desktop-amdcpu.cfg index 8b0dbbf..e88aea6 100644 --- a/dishes/phyllome-desktop-amdcpu.cfg +++ b/dishes/phyllome-desktop-amdcpu.cfg @@ -190,18 +190,22 @@ 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 and store it to the newly created iso directory # fetch custom script and make it executable -wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post/create-user-vms.sh -P /mnt/sysimage/usr/sbin/ +wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/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/ +wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/create-system-vms.sh -P /mnt/sysimage/usr/sbin/ +chmod +x /mnt/sysimage/usr/sbin/create-system-vms.sh + +# 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/sbin/ chmod +x /mnt/sysimage/usr/sbin/virtualization-tweaks-root-needed.sh %end %post --nochroot --logfile=/mnt/sysimage/opt/base-hypervisor-amdcpu.log -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. +sed -i 's/\(quiet\)/\1 amd_iommu=on iommu=pt rd.driver.pre=vfio-pci/i' /mnt/sysimage/etc/default/grub # Load kernel modules in GRUB. echo "options kvm_amd nested=1" >> /mnt/sysimage/etc/modprobe.d/kvm.conf # Add support for nested-virtualization @@ -236,6 +240,7 @@ gnome-shell gnome-terminal guestfs-tools libguestfs-tools +libusb libvirt libvirt-daemon-config-network libvirt-daemon-kvm @@ -245,6 +250,7 @@ neofetch pciutils python3-libguestfs qemu-kvm +usbutils virt-install virt-manager virt-top diff --git a/dishes/phyllome-desktop.cfg b/dishes/phyllome-desktop.cfg index 26d0fd9..ff867a2 100644 --- a/dishes/phyllome-desktop.cfg +++ b/dishes/phyllome-desktop.cfg @@ -37,7 +37,7 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt part /boot --fstype="ext4" --size=384 --label=boot part / --fstype="ext4" --grow --label=root -%post --logfile=/root/b.log +%post --logfile=/opt/base.log localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked. dnf update -y # Update the system @@ -45,6 +45,75 @@ grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful %end +%post --nochroot --logfile=/mnt/sysimage/opt/base-desktop-gnome.log + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.background.gschema.override<< EOF +[org.gnome.desktop.background] +picture-uri='file:///usr/share/backgrounds/elementary/Morskie Oko.jpg' +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.media-handling.gschema.override<< EOF +[org.gnome.desktop.media-handling] +automount-open=false +autorun-never=true +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.Terminal.gschema.override<< EOF +[org.gnome.Terminal.Legacy.Profile] +font='DejaVu Sans Mono 12' +use-system-font=false +audible-bell=false +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.wm.preferences.gschema.override<< EOF +[org.gnome.desktop.wm.preferences] +button-layout=':minimize,maximize,close' +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.a11y.gschema.override<< EOF +[org.gnome.desktop.a11y] +always-show-universal-access-status=true +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.interface.gschema.override<< EOF +[org.gnome.desktop.interface] +enable-animations=false +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.privacy.gschema.override<< EOF +[org.gnome.desktop.privacy] +remove-old-temp-files=true +remember-recent-files=false +remember-app-usage=false +disable-camera=true +disable-microphone=true +disable-sound-output=true +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.search-providers.gschema.override<< EOF +[org.gnome.desktop.search-providers] +disable-external=true +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.notifications.gschema.override<< EOF +[org.gnome.desktop.notifications.application] +enable-sound-alerts=false +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.sound.gschema.override<< EOF +[org.gnome.desktop.sound] +event-sounds=false +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.thumbnailers.gschema.override<< EOF +[org.gnome.desktop.thumbnailers] +disable-all=true +EOF + +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 @@ -55,50 +124,83 @@ 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/root/bh.log -# %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 +%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/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 +wget https://boot.netboot.xyz/ipxe/netboot.xyz.iso -P /mnt/sysimage/var/lib/libvirt/iso/ # fetch netboot.xyz iso and store it to the newly created iso directory # fetch custom script and make it executable -wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post/configure-vmm-and-desktop.sh -P /mnt/sysimage/usr/sbin/ -chmod +x /mnt/sysimage/usr/sbin/configure-vmm-and-desktop.sh +wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/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/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-first-startup-scripts/create-system-vms.sh -P /mnt/sysimage/usr/sbin/ +chmod +x /mnt/sysimage/usr/sbin/create-system-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/ +wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/virtualization-tweaks-root-needed.sh -P /mnt/sysimage/usr/sbin/ chmod +x /mnt/sysimage/usr/sbin/virtualization-tweaks-root-needed.sh -# # Create new file /etc/systemd/system/postinstall.service using cat: -# cat > /mnt/sysimage/etc/systemd/system/post-install.service<< EOF -# [Unit] -# Description=Post-installation configuration for Phyllome OS -# After=gdm.service -# Requires=gdm.service -# -# [Service] -# Type=oneshot -# ExecStart=/bin/bash /usr/sbin/post-install.sh -# RemainAfterExit=yes -# -# [Install] -# WantedBy=multi-user.target -# EOF -# -# systemctl enable /mnt/sysimage/etc/systemd/system/post-install.service # Enable systemd unit - -# Add a network bridge. Still need to declare it to libvirt/virt-manager -# nmcli con add ifname br0 type bridge con-name br0 -# nmcli con add type bridge-slave ifname enp1s0 master br0 # to-do : generalize this command so that it could regardless of the name of the ethernet device -# nmcli con up br0 - %end %post --nochroot --logfile=/mnt/sysimage/opt/base-initial-setup-gnome.log @@ -130,6 +232,7 @@ gnome-shell gnome-terminal guestfs-tools libguestfs-tools +libusb libvirt libvirt-daemon-config-network libvirt-daemon-kvm @@ -139,6 +242,7 @@ neofetch pciutils python3-libguestfs qemu-kvm +usbutils virt-install virt-manager virt-top diff --git a/dishes/phyllome-server.cfg b/dishes/phyllome-server.cfg index d1cb5c6..0bf764e 100644 --- a/dishes/phyllome-server.cfg +++ b/dishes/phyllome-server.cfg @@ -37,7 +37,7 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt part /boot --fstype="ext4" --size=384 --label=boot part / --fstype="ext4" --grow --label=root -%post --logfile=/root/b.log +%post --logfile=/opt/base.log localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked. dnf update -y # Update the system @@ -45,48 +45,30 @@ grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful %end -%post --nochroot --logfile=/mnt/sysimage/root/bh.log -# %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 +%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/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 +wget https://boot.netboot.xyz/ipxe/netboot.xyz.iso -P /mnt/sysimage/var/lib/libvirt/iso/ # fetch netboot.xyz iso and store it to the newly created iso directory # fetch custom script and make it executable -wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post/configure-vmm-and-desktop.sh -P /mnt/sysimage/usr/sbin/ -chmod +x /mnt/sysimage/usr/sbin/configure-vmm-and-desktop.sh +wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/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/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-first-startup-scripts/create-system-vms.sh -P /mnt/sysimage/usr/sbin/ +chmod +x /mnt/sysimage/usr/sbin/create-system-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/ +wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/virtualization-tweaks-root-needed.sh -P /mnt/sysimage/usr/sbin/ chmod +x /mnt/sysimage/usr/sbin/virtualization-tweaks-root-needed.sh -# # Create new file /etc/systemd/system/postinstall.service using cat: -# cat > /mnt/sysimage/etc/systemd/system/post-install.service<< EOF -# [Unit] -# Description=Post-installation configuration for Phyllome OS -# After=gdm.service -# Requires=gdm.service -# -# [Service] -# Type=oneshot -# ExecStart=/bin/bash /usr/sbin/post-install.sh -# RemainAfterExit=yes -# -# [Install] -# WantedBy=multi-user.target -# EOF -# -# systemctl enable /mnt/sysimage/etc/systemd/system/post-install.service # Enable systemd unit - -# Add a network bridge. Still need to declare it to libvirt/virt-manager -# nmcli con add ifname br0 type bridge con-name br0 -# nmcli con add type bridge-slave ifname enp1s0 master br0 # to-do : generalize this command so that it could regardless of the name of the ethernet device -# nmcli con up br0 - %end %packages --exclude-weakdeps @@ -100,6 +82,7 @@ generic-release-notes guestfs-tools initial-setup libguestfs-tools +libusb libvirt libvirt-daemon-config-network libvirt-daemon-kvm @@ -108,6 +91,7 @@ neofetch pciutils python3-libguestfs qemu-kvm +usbutils virt-install virt-top wget