From 473c66f345a5192af96ac434f0728e0d4634f160 Mon Sep 17 00:00:00 2001 From: Lukas Date: Tue, 11 Jan 2022 14:52:57 +0100 Subject: [PATCH] logs under /opt add USB 3.0 support --- dishes/virtual-phyllome-desktop.cfg | 44 ++++++++--------------------- dishes/virtual-server-encrypted.cfg | 4 ++- dishes/virtual-server.cfg | 4 ++- 3 files changed, 17 insertions(+), 35 deletions(-) diff --git a/dishes/virtual-phyllome-desktop.cfg b/dishes/virtual-phyllome-desktop.cfg index 35d3fe5..6ea5489 100644 --- a/dishes/virtual-phyllome-desktop.cfg +++ b/dishes/virtual-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 @@ -177,8 +177,7 @@ 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 @@ -188,43 +187,20 @@ 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 - -# 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 -# # 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 @@ -256,6 +232,7 @@ gnome-shell gnome-terminal guestfs-tools libguestfs-tools +libusb libvirt libvirt-daemon-config-network libvirt-daemon-kvm @@ -267,6 +244,7 @@ python3-libguestfs qemu-guest-agent qemu-kvm spice-vdagent +usbutils virt-install virt-manager virt-top diff --git a/dishes/virtual-server-encrypted.cfg b/dishes/virtual-server-encrypted.cfg index 3fd5472..e802dbd 100644 --- a/dishes/virtual-server-encrypted.cfg +++ b/dishes/virtual-server-encrypted.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 --encrypted --luks-version=luks2 -%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 @@ -54,11 +54,13 @@ generic-release generic-release-common generic-release-notes initial-setup +libusb nano neofetch pciutils qemu-guest-agent spice-vdagent +usbutils wget -fedora-logos -fedora-release diff --git a/dishes/virtual-server.cfg b/dishes/virtual-server.cfg index b68c15a..e9b66c8 100644 --- a/dishes/virtual-server.cfg +++ b/dishes/virtual-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 @@ -54,11 +54,13 @@ generic-release generic-release-common generic-release-notes initial-setup +libusb nano neofetch pciutils qemu-guest-agent spice-vdagent +usbutils wget -fedora-logos -fedora-release