From f0aa553e041c8e6e46f702c48b3696089b00b6cb Mon Sep 17 00:00:00 2001 From: Lukas Date: Mon, 3 Jan 2022 21:21:23 +0100 Subject: [PATCH] create new directories it follows a cuisine analogy, with dishes made followed a recipe, using ingredients --- blocks-live/live-server-hypervisor-a.cfg | 8 - blocks-live/live-server-hypervisor-ii.cfg | 8 - blocks-live/live-server-hypervisor.cfg | 8 - blocks-live/live-server.cfg | 8 - blocks/desktop-hypervisor-intelcpu-intelgpu | 24 -- {leaves => dishes}/desktop.cfg | 0 {leaves => dishes}/dev-virtual-desktop.cfg | 0 {leaves => dishes}/dev-virtual-server.cfg | 0 {leaves => dishes}/flat-d.cfg | 0 {leaves => dishes}/flat-dh.cfg | 0 {leaves => dishes}/flat-dhi.cfg | 0 {leaves => dishes}/flat-ld.cfg | 0 {leaves => dishes}/flat-ldhi.cfg | 0 {leaves => dishes}/flat-s.cfg | 0 {leaves => dishes}/flat-server.cfg | 0 {leaves => dishes}/flat-sh.cfg | 0 {leaves => dishes}/flat-shi.cfg | 0 {leaves => dishes}/nano-server.cfg | 0 {leaves => dishes}/phyllome-desktop-a.cfg | 0 dishes/phyllome-desktop-amdcpu.cfg | 260 ++++++++++++++++++ {leaves => dishes}/phyllome-desktop-ii.cfg | 0 {leaves => dishes}/phyllome-desktop.cfg | 0 {leaves => dishes}/phyllome-server-a.cfg | 0 {leaves => dishes}/phyllome-server-ii.cfg | 0 {leaves => dishes}/phyllome-server.cfg | 0 {leaves => dishes}/server-cdrom.cfg | 0 {leaves => dishes}/server.cfg | 0 {leaves => dishes}/virtual-desktop.cfg | 0 .../virtual-phyllome-desktop-cdrom.cfg | 0 .../virtual-phyllome-desktop.cfg | 0 .../virtual-server-encrypted.cfg | 0 {leaves => dishes}/virtual-server.cfg | 0 .../base-desktop-gnome.cfg | 0 .../base-desktop-virtual-machine-manager.cfg | 0 .../base-fedora-repo-cdrom.cfg | 0 .../base-fedora-repo-rawhide.cfg | 0 {blocks => ingredients}/base-fedora-repo.cfg | 0 {blocks => ingredients}/base-guest-agents.cfg | 0 .../base-hypervisor-amdcpu.cfg | 0 .../base-hypervisor-intelcpu.cfg | 0 .../base-hypervisor-intelgpu.cfg | 0 {blocks => ingredients}/base-hypervisor.cfg | 0 .../base-initial-setup-gnome.cfg | 0 .../base-initial-setup.cfg | 0 .../base-live-hypervisor-a.cfg | 0 .../base-live-hypervisor-ii.cfg | 0 .../base-live-hypervisor.cfg | 0 {blocks-live => ingredients}/base-live.cfg | 0 {blocks => ingredients}/base-nano.cfg | 0 .../base-storage-encrypted.cfg | 0 {blocks => ingredients}/base-storage.cfg | 0 {blocks => ingredients}/base.cfg | 0 {blocks => ingredients}/dev-base.cfg | 0 .../create-system-vms.sh | 0 .../create-user-vms.sh | 0 .../virtualization-tweaks-root-needed.sh | 0 {blocks-live => recipes}/LICENSE.md | 0 .../desktop-hypervisor-amdcpu.cfg | 18 +- .../desktop-hypervisor-intelcpu-intelgpu.cfg | 24 ++ .../desktop-hypervisor-intelcpu.cfg | 18 +- {blocks => recipes}/desktop-hypervisor.cfg | 16 +- {blocks => recipes}/desktop.cfg | 12 +- {blocks => recipes}/dev-virtual-desktop.cfg | 12 +- {blocks => recipes}/dev-virtual-server.cfg | 10 +- .../live-desktop-hypervisor-a.cfg | 8 +- .../live-desktop-hypervisor-ii.cfg | 8 +- .../live-desktop-hypervisor.cfg | 6 +- {blocks-live => recipes}/live-desktop.cfg | 6 +- {blocks => recipes}/nano.cfg | 10 +- {blocks => recipes}/server-cdrom.cfg | 12 +- .../server-hypervisor-amdcpu.cfg | 14 +- .../server-hypervisor-intelcpu-intelgpu.cfg | 16 +- {blocks => recipes}/server-hypervisor.cfg | 12 +- {blocks => recipes}/server.cfg | 10 +- .../virtual-desktop-hypervisor.cfg | 18 +- {blocks => recipes}/virtual-desktop.cfg | 14 +- .../virtual-server-encrypted.cfg | 12 +- {blocks => recipes}/virtual-server.cfg | 12 +- 78 files changed, 406 insertions(+), 178 deletions(-) delete mode 100644 blocks-live/live-server-hypervisor-a.cfg delete mode 100644 blocks-live/live-server-hypervisor-ii.cfg delete mode 100644 blocks-live/live-server-hypervisor.cfg delete mode 100644 blocks-live/live-server.cfg delete mode 100644 blocks/desktop-hypervisor-intelcpu-intelgpu rename {leaves => dishes}/desktop.cfg (100%) rename {leaves => dishes}/dev-virtual-desktop.cfg (100%) rename {leaves => dishes}/dev-virtual-server.cfg (100%) rename {leaves => dishes}/flat-d.cfg (100%) rename {leaves => dishes}/flat-dh.cfg (100%) rename {leaves => dishes}/flat-dhi.cfg (100%) rename {leaves => dishes}/flat-ld.cfg (100%) rename {leaves => dishes}/flat-ldhi.cfg (100%) rename {leaves => dishes}/flat-s.cfg (100%) rename {leaves => dishes}/flat-server.cfg (100%) rename {leaves => dishes}/flat-sh.cfg (100%) rename {leaves => dishes}/flat-shi.cfg (100%) rename {leaves => dishes}/nano-server.cfg (100%) rename {leaves => dishes}/phyllome-desktop-a.cfg (100%) create mode 100644 dishes/phyllome-desktop-amdcpu.cfg rename {leaves => dishes}/phyllome-desktop-ii.cfg (100%) rename {leaves => dishes}/phyllome-desktop.cfg (100%) rename {leaves => dishes}/phyllome-server-a.cfg (100%) rename {leaves => dishes}/phyllome-server-ii.cfg (100%) rename {leaves => dishes}/phyllome-server.cfg (100%) rename {leaves => dishes}/server-cdrom.cfg (100%) rename {leaves => dishes}/server.cfg (100%) rename {leaves => dishes}/virtual-desktop.cfg (100%) rename {leaves => dishes}/virtual-phyllome-desktop-cdrom.cfg (100%) rename {leaves => dishes}/virtual-phyllome-desktop.cfg (100%) rename {leaves => dishes}/virtual-server-encrypted.cfg (100%) rename {leaves => dishes}/virtual-server.cfg (100%) rename {blocks => ingredients}/base-desktop-gnome.cfg (100%) rename {blocks => ingredients}/base-desktop-virtual-machine-manager.cfg (100%) rename {blocks => ingredients}/base-fedora-repo-cdrom.cfg (100%) rename {blocks => ingredients}/base-fedora-repo-rawhide.cfg (100%) rename {blocks => ingredients}/base-fedora-repo.cfg (100%) rename {blocks => ingredients}/base-guest-agents.cfg (100%) rename {blocks => ingredients}/base-hypervisor-amdcpu.cfg (100%) rename {blocks => ingredients}/base-hypervisor-intelcpu.cfg (100%) rename {blocks => ingredients}/base-hypervisor-intelgpu.cfg (100%) rename {blocks => ingredients}/base-hypervisor.cfg (100%) rename {blocks => ingredients}/base-initial-setup-gnome.cfg (100%) rename {blocks => ingredients}/base-initial-setup.cfg (100%) rename {blocks-live => ingredients}/base-live-hypervisor-a.cfg (100%) rename {blocks-live => ingredients}/base-live-hypervisor-ii.cfg (100%) rename {blocks-live => ingredients}/base-live-hypervisor.cfg (100%) rename {blocks-live => ingredients}/base-live.cfg (100%) rename {blocks => ingredients}/base-nano.cfg (100%) rename {blocks => ingredients}/base-storage-encrypted.cfg (100%) rename {blocks => ingredients}/base-storage.cfg (100%) rename {blocks => ingredients}/base.cfg (100%) rename {blocks => ingredients}/dev-base.cfg (100%) rename {post => post-first-startup-scripts}/create-system-vms.sh (100%) rename {post => post-first-startup-scripts}/create-user-vms.sh (100%) rename {post => post-first-startup-scripts}/virtualization-tweaks-root-needed.sh (100%) rename {blocks-live => recipes}/LICENSE.md (100%) rename {blocks => recipes}/desktop-hypervisor-amdcpu.cfg (50%) create mode 100644 recipes/desktop-hypervisor-intelcpu-intelgpu.cfg rename {blocks => recipes}/desktop-hypervisor-intelcpu.cfg (50%) rename {blocks => recipes}/desktop-hypervisor.cfg (52%) rename {blocks => recipes}/desktop.cfg (62%) rename {blocks => recipes}/dev-virtual-desktop.cfg (65%) rename {blocks => recipes}/dev-virtual-server.cfg (70%) rename {blocks-live => recipes}/live-desktop-hypervisor-a.cfg (88%) rename {blocks-live => recipes}/live-desktop-hypervisor-ii.cfg (86%) rename {blocks-live => recipes}/live-desktop-hypervisor.cfg (90%) rename {blocks-live => recipes}/live-desktop.cfg (94%) rename {blocks => recipes}/nano.cfg (66%) rename {blocks => recipes}/server-cdrom.cfg (65%) rename {blocks => recipes}/server-hypervisor-amdcpu.cfg (60%) rename {blocks => recipes}/server-hypervisor-intelcpu-intelgpu.cfg (54%) rename {blocks => recipes}/server-hypervisor.cfg (65%) rename {blocks => recipes}/server.cfg (69%) rename {blocks => recipes}/virtual-desktop-hypervisor.cfg (52%) rename {blocks => recipes}/virtual-desktop.cfg (60%) rename {blocks => recipes}/virtual-server-encrypted.cfg (68%) rename {blocks => recipes}/virtual-server.cfg (63%) diff --git a/blocks-live/live-server-hypervisor-a.cfg b/blocks-live/live-server-hypervisor-a.cfg deleted file mode 100644 index 24213c7..0000000 --- a/blocks-live/live-server-hypervisor-a.cfg +++ /dev/null @@ -1,8 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? When flattened, this file will result in a stand-alone kickstart file that can be automatically deploy into a server-oriented live system with a hypervisor optimized for AMD (tm) CPUs diff --git a/blocks-live/live-server-hypervisor-ii.cfg b/blocks-live/live-server-hypervisor-ii.cfg deleted file mode 100644 index 483b6f7..0000000 --- a/blocks-live/live-server-hypervisor-ii.cfg +++ /dev/null @@ -1,8 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? When flattened, this file will result in a stand-alone kickstart file that can be automatically deploy into a server-oriented live system with a hypervisor optimized for Intel (tm) CPUs and GPUs diff --git a/blocks-live/live-server-hypervisor.cfg b/blocks-live/live-server-hypervisor.cfg deleted file mode 100644 index 45755b3..0000000 --- a/blocks-live/live-server-hypervisor.cfg +++ /dev/null @@ -1,8 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? When flattened, this file will result in a stand-alone kickstart file that can be automatically deploy into a server-oriented live system with a hypervisor diff --git a/blocks-live/live-server.cfg b/blocks-live/live-server.cfg deleted file mode 100644 index ee82a4c..0000000 --- a/blocks-live/live-server.cfg +++ /dev/null @@ -1,8 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? When flattened, this file will result in a stand-alone kickstart file that can be automatically deploy into a server-oriented live system. diff --git a/blocks/desktop-hypervisor-intelcpu-intelgpu b/blocks/desktop-hypervisor-intelcpu-intelgpu deleted file mode 100644 index beb6ffb..0000000 --- a/blocks/desktop-hypervisor-intelcpu-intelgpu +++ /dev/null @@ -1,24 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? This kickstart file bootstraps a desktop hypervisor configured for Intel(tm) CPU and Intel(tm) GPUs compatible with vfio-mdev (pre-Tiger Lake) - -# In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. -# Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c desktop-hypervisor-intelcpu-intelgpu.cfg -o ../leaves/phyllome-desktop-intelcpu-intelgpu.cfg - -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include base.cfg # A minimal machine -%include base-desktop-gnome.cfg # A desktop environment that ships with virtual machine manager -%include base-desktop-virtual-machine-manager.cfg # the virtual machine manager -%include base-hypervisor.cfg # A base hypervisor -%include base-hypervisor-intelcpu.cfg # Specific virtualization configuration for Intel (tm) CPUs -%include base-hypervisor-intelgpu.cfg # Specific virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev). -%include base-initial-setup-gnome.cfg # Includes initial-setup for GNOME - -reboot --kexec # Reboot straight into the system after a successfull installation \ No newline at end of file diff --git a/leaves/desktop.cfg b/dishes/desktop.cfg similarity index 100% rename from leaves/desktop.cfg rename to dishes/desktop.cfg diff --git a/leaves/dev-virtual-desktop.cfg b/dishes/dev-virtual-desktop.cfg similarity index 100% rename from leaves/dev-virtual-desktop.cfg rename to dishes/dev-virtual-desktop.cfg diff --git a/leaves/dev-virtual-server.cfg b/dishes/dev-virtual-server.cfg similarity index 100% rename from leaves/dev-virtual-server.cfg rename to dishes/dev-virtual-server.cfg diff --git a/leaves/flat-d.cfg b/dishes/flat-d.cfg similarity index 100% rename from leaves/flat-d.cfg rename to dishes/flat-d.cfg diff --git a/leaves/flat-dh.cfg b/dishes/flat-dh.cfg similarity index 100% rename from leaves/flat-dh.cfg rename to dishes/flat-dh.cfg diff --git a/leaves/flat-dhi.cfg b/dishes/flat-dhi.cfg similarity index 100% rename from leaves/flat-dhi.cfg rename to dishes/flat-dhi.cfg diff --git a/leaves/flat-ld.cfg b/dishes/flat-ld.cfg similarity index 100% rename from leaves/flat-ld.cfg rename to dishes/flat-ld.cfg diff --git a/leaves/flat-ldhi.cfg b/dishes/flat-ldhi.cfg similarity index 100% rename from leaves/flat-ldhi.cfg rename to dishes/flat-ldhi.cfg diff --git a/leaves/flat-s.cfg b/dishes/flat-s.cfg similarity index 100% rename from leaves/flat-s.cfg rename to dishes/flat-s.cfg diff --git a/leaves/flat-server.cfg b/dishes/flat-server.cfg similarity index 100% rename from leaves/flat-server.cfg rename to dishes/flat-server.cfg diff --git a/leaves/flat-sh.cfg b/dishes/flat-sh.cfg similarity index 100% rename from leaves/flat-sh.cfg rename to dishes/flat-sh.cfg diff --git a/leaves/flat-shi.cfg b/dishes/flat-shi.cfg similarity index 100% rename from leaves/flat-shi.cfg rename to dishes/flat-shi.cfg diff --git a/leaves/nano-server.cfg b/dishes/nano-server.cfg similarity index 100% rename from leaves/nano-server.cfg rename to dishes/nano-server.cfg diff --git a/leaves/phyllome-desktop-a.cfg b/dishes/phyllome-desktop-a.cfg similarity index 100% rename from leaves/phyllome-desktop-a.cfg rename to dishes/phyllome-desktop-a.cfg diff --git a/dishes/phyllome-desktop-amdcpu.cfg b/dishes/phyllome-desktop-amdcpu.cfg new file mode 100644 index 0000000..8b0dbbf --- /dev/null +++ b/dishes/phyllome-desktop-amdcpu.cfg @@ -0,0 +1,260 @@ +# Generated by pykickstart v3.34 +#version=DEVEL +# X Window System configuration information +xconfig --defaultdesktop=GNOME --startxonboot +# Keyboard layouts +keyboard --xlayouts='ch (fr)' +# Root password +rootpw --iscrypted --lock locked +# System language +lang en_US.UTF-8 +# Reboot after installation +reboot --kexec +# Use text mode install +text +# Network information +network --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate +# Firewall configuration +firewall --enabled --service=mdns +# Use network installation +url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch" +repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch +repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch +# System timezone +timezone Europe/Paris --utc +# SELinux configuration +selinux --enforcing +# System services +services --disabled="sshd" --enabled="NetworkManager,libvirtd" +# System bootloader configuration +bootloader --location=mbr --timeout=1 +# Clear the Master Boot Record +zerombr +# Partition clearing information +clearpart --all --initlabel +# Disk partitioning information +part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt" --label=efi +part /boot --fstype="ext4" --size=384 --label=boot +part / --fstype="ext4" --grow --label=root + +%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 +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 +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/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/ +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/ +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. + +echo "options kvm_amd nested=1" >> /mnt/sysimage/etc/modprobe.d/kvm.conf # Add support for nested-virtualization + +%end + +%post --nochroot --logfile=/mnt/sysimage/opt/base-initial-setup-gnome.log + +truncate -s 0 /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf # remove content of vendor.conf so that all options are made available + +## Append lines to existing vendor.conf file, so that options are skipped upon reboot +cat >> /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf<< EOF +[pages] +skip=privacy +[goa] +providers=local-first! +EOF + +%end + +%packages --exclude-weakdeps +@core +@hardware-support +dejavu-sans-mono-fonts +elementary-wallpapers-gnome.noarch +fedora-remix-logos +generic-logos +generic-release +generic-release-common +generic-release-notes +gnome-initial-setup +gnome-shell +gnome-terminal +guestfs-tools +libguestfs-tools +libvirt +libvirt-daemon-config-network +libvirt-daemon-kvm +mesa-dri-drivers +nano +neofetch +pciutils +python3-libguestfs +qemu-kvm +virt-install +virt-manager +virt-top +wget +wpa_supplicant +-fedora-logos +-fedora-release +-fedora-release-common +-fedora-release-identity-basic +-fedora-release-notes +-gnome-tour + +%end diff --git a/leaves/phyllome-desktop-ii.cfg b/dishes/phyllome-desktop-ii.cfg similarity index 100% rename from leaves/phyllome-desktop-ii.cfg rename to dishes/phyllome-desktop-ii.cfg diff --git a/leaves/phyllome-desktop.cfg b/dishes/phyllome-desktop.cfg similarity index 100% rename from leaves/phyllome-desktop.cfg rename to dishes/phyllome-desktop.cfg diff --git a/leaves/phyllome-server-a.cfg b/dishes/phyllome-server-a.cfg similarity index 100% rename from leaves/phyllome-server-a.cfg rename to dishes/phyllome-server-a.cfg diff --git a/leaves/phyllome-server-ii.cfg b/dishes/phyllome-server-ii.cfg similarity index 100% rename from leaves/phyllome-server-ii.cfg rename to dishes/phyllome-server-ii.cfg diff --git a/leaves/phyllome-server.cfg b/dishes/phyllome-server.cfg similarity index 100% rename from leaves/phyllome-server.cfg rename to dishes/phyllome-server.cfg diff --git a/leaves/server-cdrom.cfg b/dishes/server-cdrom.cfg similarity index 100% rename from leaves/server-cdrom.cfg rename to dishes/server-cdrom.cfg diff --git a/leaves/server.cfg b/dishes/server.cfg similarity index 100% rename from leaves/server.cfg rename to dishes/server.cfg diff --git a/leaves/virtual-desktop.cfg b/dishes/virtual-desktop.cfg similarity index 100% rename from leaves/virtual-desktop.cfg rename to dishes/virtual-desktop.cfg diff --git a/leaves/virtual-phyllome-desktop-cdrom.cfg b/dishes/virtual-phyllome-desktop-cdrom.cfg similarity index 100% rename from leaves/virtual-phyllome-desktop-cdrom.cfg rename to dishes/virtual-phyllome-desktop-cdrom.cfg diff --git a/leaves/virtual-phyllome-desktop.cfg b/dishes/virtual-phyllome-desktop.cfg similarity index 100% rename from leaves/virtual-phyllome-desktop.cfg rename to dishes/virtual-phyllome-desktop.cfg diff --git a/leaves/virtual-server-encrypted.cfg b/dishes/virtual-server-encrypted.cfg similarity index 100% rename from leaves/virtual-server-encrypted.cfg rename to dishes/virtual-server-encrypted.cfg diff --git a/leaves/virtual-server.cfg b/dishes/virtual-server.cfg similarity index 100% rename from leaves/virtual-server.cfg rename to dishes/virtual-server.cfg diff --git a/blocks/base-desktop-gnome.cfg b/ingredients/base-desktop-gnome.cfg similarity index 100% rename from blocks/base-desktop-gnome.cfg rename to ingredients/base-desktop-gnome.cfg diff --git a/blocks/base-desktop-virtual-machine-manager.cfg b/ingredients/base-desktop-virtual-machine-manager.cfg similarity index 100% rename from blocks/base-desktop-virtual-machine-manager.cfg rename to ingredients/base-desktop-virtual-machine-manager.cfg diff --git a/blocks/base-fedora-repo-cdrom.cfg b/ingredients/base-fedora-repo-cdrom.cfg similarity index 100% rename from blocks/base-fedora-repo-cdrom.cfg rename to ingredients/base-fedora-repo-cdrom.cfg diff --git a/blocks/base-fedora-repo-rawhide.cfg b/ingredients/base-fedora-repo-rawhide.cfg similarity index 100% rename from blocks/base-fedora-repo-rawhide.cfg rename to ingredients/base-fedora-repo-rawhide.cfg diff --git a/blocks/base-fedora-repo.cfg b/ingredients/base-fedora-repo.cfg similarity index 100% rename from blocks/base-fedora-repo.cfg rename to ingredients/base-fedora-repo.cfg diff --git a/blocks/base-guest-agents.cfg b/ingredients/base-guest-agents.cfg similarity index 100% rename from blocks/base-guest-agents.cfg rename to ingredients/base-guest-agents.cfg diff --git a/blocks/base-hypervisor-amdcpu.cfg b/ingredients/base-hypervisor-amdcpu.cfg similarity index 100% rename from blocks/base-hypervisor-amdcpu.cfg rename to ingredients/base-hypervisor-amdcpu.cfg diff --git a/blocks/base-hypervisor-intelcpu.cfg b/ingredients/base-hypervisor-intelcpu.cfg similarity index 100% rename from blocks/base-hypervisor-intelcpu.cfg rename to ingredients/base-hypervisor-intelcpu.cfg diff --git a/blocks/base-hypervisor-intelgpu.cfg b/ingredients/base-hypervisor-intelgpu.cfg similarity index 100% rename from blocks/base-hypervisor-intelgpu.cfg rename to ingredients/base-hypervisor-intelgpu.cfg diff --git a/blocks/base-hypervisor.cfg b/ingredients/base-hypervisor.cfg similarity index 100% rename from blocks/base-hypervisor.cfg rename to ingredients/base-hypervisor.cfg diff --git a/blocks/base-initial-setup-gnome.cfg b/ingredients/base-initial-setup-gnome.cfg similarity index 100% rename from blocks/base-initial-setup-gnome.cfg rename to ingredients/base-initial-setup-gnome.cfg diff --git a/blocks/base-initial-setup.cfg b/ingredients/base-initial-setup.cfg similarity index 100% rename from blocks/base-initial-setup.cfg rename to ingredients/base-initial-setup.cfg diff --git a/blocks-live/base-live-hypervisor-a.cfg b/ingredients/base-live-hypervisor-a.cfg similarity index 100% rename from blocks-live/base-live-hypervisor-a.cfg rename to ingredients/base-live-hypervisor-a.cfg diff --git a/blocks-live/base-live-hypervisor-ii.cfg b/ingredients/base-live-hypervisor-ii.cfg similarity index 100% rename from blocks-live/base-live-hypervisor-ii.cfg rename to ingredients/base-live-hypervisor-ii.cfg diff --git a/blocks-live/base-live-hypervisor.cfg b/ingredients/base-live-hypervisor.cfg similarity index 100% rename from blocks-live/base-live-hypervisor.cfg rename to ingredients/base-live-hypervisor.cfg diff --git a/blocks-live/base-live.cfg b/ingredients/base-live.cfg similarity index 100% rename from blocks-live/base-live.cfg rename to ingredients/base-live.cfg diff --git a/blocks/base-nano.cfg b/ingredients/base-nano.cfg similarity index 100% rename from blocks/base-nano.cfg rename to ingredients/base-nano.cfg diff --git a/blocks/base-storage-encrypted.cfg b/ingredients/base-storage-encrypted.cfg similarity index 100% rename from blocks/base-storage-encrypted.cfg rename to ingredients/base-storage-encrypted.cfg diff --git a/blocks/base-storage.cfg b/ingredients/base-storage.cfg similarity index 100% rename from blocks/base-storage.cfg rename to ingredients/base-storage.cfg diff --git a/blocks/base.cfg b/ingredients/base.cfg similarity index 100% rename from blocks/base.cfg rename to ingredients/base.cfg diff --git a/blocks/dev-base.cfg b/ingredients/dev-base.cfg similarity index 100% rename from blocks/dev-base.cfg rename to ingredients/dev-base.cfg diff --git a/post/create-system-vms.sh b/post-first-startup-scripts/create-system-vms.sh similarity index 100% rename from post/create-system-vms.sh rename to post-first-startup-scripts/create-system-vms.sh diff --git a/post/create-user-vms.sh b/post-first-startup-scripts/create-user-vms.sh similarity index 100% rename from post/create-user-vms.sh rename to post-first-startup-scripts/create-user-vms.sh diff --git a/post/virtualization-tweaks-root-needed.sh b/post-first-startup-scripts/virtualization-tweaks-root-needed.sh similarity index 100% rename from post/virtualization-tweaks-root-needed.sh rename to post-first-startup-scripts/virtualization-tweaks-root-needed.sh diff --git a/blocks-live/LICENSE.md b/recipes/LICENSE.md similarity index 100% rename from blocks-live/LICENSE.md rename to recipes/LICENSE.md diff --git a/blocks/desktop-hypervisor-amdcpu.cfg b/recipes/desktop-hypervisor-amdcpu.cfg similarity index 50% rename from blocks/desktop-hypervisor-amdcpu.cfg rename to recipes/desktop-hypervisor-amdcpu.cfg index 08a4c15..2e7b267 100644 --- a/blocks/desktop-hypervisor-amdcpu.cfg +++ b/recipes/desktop-hypervisor-amdcpu.cfg @@ -9,15 +9,15 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c desktop-hypervisor-amdcpu.cfg -o ../leaves/phyllome-desktop-amdcpu.cfg +# ksflatten -c desktop-hypervisor-amdcpu.cfg -o ../dishes/phyllome-desktop-amdcpu.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include base.cfg # A minimal machine -%include base-desktop-gnome.cfg # A desktop environment that ships with virtual machine manager -%include base-desktop-virtual-machine-manager.cfg # the virtual machine manager -%include base-hypervisor.cfg # A base hypervisor -%include base-hypervisor-amdcpu.cfg # Specific virtualization configuration for AMD (tm) CPUs -%include base-initial-setup-gnome.cfg # Includes initial-setup for GNOME +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/base.cfg # A minimal machine +%include ../ingredients/base-desktop-gnome.cfg # A desktop environment that ships with virtual machine manager +%include ../ingredients/base-desktop-virtual-machine-manager.cfg # the virtual machine manager +%include ../ingredients/base-hypervisor.cfg # A base hypervisor +%include ../ingredients/base-hypervisor-amdcpu.cfg # Specific virtualization configuration for AMD (tm) CPUs +%include ../ingredients/base-initial-setup-gnome.cfg # Includes initial-setup for GNOME reboot --kexec # Reboot straight into the system after a successfull installation \ No newline at end of file diff --git a/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg b/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg new file mode 100644 index 0000000..5c3a9e1 --- /dev/null +++ b/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg @@ -0,0 +1,24 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ + +# What ? This kickstart file bootstraps a desktop hypervisor configured for Intel(tm) CPU and Intel(tm) GPUs compatible with vfio-mdev (pre-Tiger Lake) + +# In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. +# Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : +# ksflatten -c desktop-hypervisor-intelcpu-intelgpu.cfg -o ../dishes/phyllome-desktop-intelcpu-intelgpu.cfg + +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/base.cfg # A minimal machine +%include ../ingredients/base-desktop-gnome.cfg # A desktop environment that ships with virtual machine manager +%include ../ingredients/base-desktop-virtual-machine-manager.cfg # the virtual machine manager +%include ../ingredients/base-hypervisor.cfg # A base hypervisor +%include ../ingredients/base-hypervisor-intelcpu.cfg # Specific virtualization configuration for Intel (tm) CPUs +%include ../ingredients/base-hypervisor-intelgpu.cfg # Specific virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev). +%include ../ingredients/base-initial-setup-gnome.cfg # Includes initial-setup for GNOME + +reboot --kexec # Reboot straight into the system after a successfull installation \ No newline at end of file diff --git a/blocks/desktop-hypervisor-intelcpu.cfg b/recipes/desktop-hypervisor-intelcpu.cfg similarity index 50% rename from blocks/desktop-hypervisor-intelcpu.cfg rename to recipes/desktop-hypervisor-intelcpu.cfg index e3486f5..cabad24 100644 --- a/blocks/desktop-hypervisor-intelcpu.cfg +++ b/recipes/desktop-hypervisor-intelcpu.cfg @@ -9,15 +9,15 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c desktop-hypervisor-intelcpu.cfg -o ../leaves/phyllome-desktop-intelcpu.cfg +# ksflatten -c desktop-hypervisor-intelcpu.cfg -o ../dishes/phyllome-desktop-intelcpu.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include base.cfg # A minimal machine -%include base-desktop-gnome.cfg # A desktop environment that ships with virtual machine manager -%include base-desktop-virtual-machine-manager.cfg # the virtual machine manager -%include base-hypervisor.cfg # A base hypervisor -%include base-hypervisor-intelcpu.cfg # Specific virtualization configuration for Intel (tm) CPUs -%include base-initial-setup-gnome.cfg # Includes initial-setup for GNOME +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/base.cfg # A minimal machine +%include ../ingredients/base-desktop-gnome.cfg # A desktop environment that ships with virtual machine manager +%include ../ingredients/base-desktop-virtual-machine-manager.cfg # the virtual machine manager +%include ../ingredients/base-hypervisor.cfg # A base hypervisor +%include ../ingredients/base-hypervisor-intelcpu.cfg # Specific virtualization configuration for Intel (tm) CPUs +%include ../ingredients/base-initial-setup-gnome.cfg # Includes initial-setup for GNOME reboot --kexec # Reboot straight into the system after a successfull installation \ No newline at end of file diff --git a/blocks/desktop-hypervisor.cfg b/recipes/desktop-hypervisor.cfg similarity index 52% rename from blocks/desktop-hypervisor.cfg rename to recipes/desktop-hypervisor.cfg index dde6eef..45569de 100644 --- a/blocks/desktop-hypervisor.cfg +++ b/recipes/desktop-hypervisor.cfg @@ -9,14 +9,14 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c desktop-hypervisor.cfg -o ../leaves/phyllome-desktop.cfg +# ksflatten -c desktop-hypervisor.cfg -o ../dishes/phyllome-desktop.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include base.cfg # A minimal machine -%include base-desktop-gnome.cfg # A desktop environment that ships with virtual machine manager -%include base-desktop-virtual-machine-manager.cfg # the virtual machine manager -%include base-hypervisor.cfg # A base hypervisor -%include base-initial-setup-gnome.cfg # Includes initial-setup for GNOME +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/base.cfg # A minimal machine +%include ../ingredients/base-desktop-gnome.cfg # A desktop environment that ships with virtual machine manager +%include ../ingredients/base-desktop-virtual-machine-manager.cfg # the virtual machine manager +%include ../ingredients/base-hypervisor.cfg # A base hypervisor +%include ../ingredients/base-initial-setup-gnome.cfg # Includes initial-setup for GNOME reboot --kexec # Reboot straight into the system after a successfull installation \ No newline at end of file diff --git a/blocks/desktop.cfg b/recipes/desktop.cfg similarity index 62% rename from blocks/desktop.cfg rename to recipes/desktop.cfg index b14226d..cfb376c 100644 --- a/blocks/desktop.cfg +++ b/recipes/desktop.cfg @@ -9,12 +9,12 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c desktop.cfg -o ../leaves/desktop.cfg +# ksflatten -c desktop.cfg -o ../dishes/desktop.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include base.cfg # A minimal machine -%include base-desktop-gnome.cfg # A desktop environment -%include base-initial-setup-gnome.cfg # Includes initial-setup for GNOME +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/base.cfg # A minimal machine +%include ../ingredients/base-desktop-gnome.cfg # A desktop environment +%include ../ingredients/base-initial-setup-gnome.cfg # Includes initial-setup for GNOME reboot --kexec # Reboot straight into the system after a successfull installation \ No newline at end of file diff --git a/blocks/dev-virtual-desktop.cfg b/recipes/dev-virtual-desktop.cfg similarity index 65% rename from blocks/dev-virtual-desktop.cfg rename to recipes/dev-virtual-desktop.cfg index ba85dac..e5881b4 100644 --- a/blocks/dev-virtual-desktop.cfg +++ b/recipes/dev-virtual-desktop.cfg @@ -10,12 +10,12 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c dev-virtual-desktop.cfg -o ../leaves/dev-virtual-desktop.cfg +# ksflatten -c dev-virtual-desktop.cfg -o ../dishes/dev-virtual-desktop.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include dev-base.cfg # A minimal machine -%include base-desktop-gnome.cfg # A desktop environment -%include base-guest-agents.cfg # Guest agents +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/dev-base.cfg # A minimal machine +%include ../ingredients/base-desktop-gnome.cfg # A desktop environment +%include ../ingredients/base-guest-agents.cfg # Guest agents reboot --kexec # Reboot straight into the system after a successfull installation \ No newline at end of file diff --git a/blocks/dev-virtual-server.cfg b/recipes/dev-virtual-server.cfg similarity index 70% rename from blocks/dev-virtual-server.cfg rename to recipes/dev-virtual-server.cfg index a3ed20d..545f8ae 100644 --- a/blocks/dev-virtual-server.cfg +++ b/recipes/dev-virtual-server.cfg @@ -10,11 +10,11 @@ # In order to be fed to virt-install or a software like livecd-creator, this file needs to be flattened. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c dev-virtual-server.cfg -o ../leaves/dev-virtual-server.cfg +# ksflatten -c dev-virtual-server.cfg -o ../dishes/dev-virtual-server.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include dev-base.cfg # A base system -%include base-guest-agents.cfg # Guest agents +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/dev-base.cfg # A base system +%include ../ingredients/base-guest-agents.cfg # Guest agents reboot --kexec # Reboot straight into the system after a successfull installation \ No newline at end of file diff --git a/blocks-live/live-desktop-hypervisor-a.cfg b/recipes/live-desktop-hypervisor-a.cfg similarity index 88% rename from blocks-live/live-desktop-hypervisor-a.cfg rename to recipes/live-desktop-hypervisor-a.cfg index 64f51c8..44b8f6a 100644 --- a/blocks-live/live-desktop-hypervisor-a.cfg +++ b/recipes/live-desktop-hypervisor-a.cfg @@ -9,7 +9,7 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c live-desktop-hypervisor-a.cfg -o ../leaves/phyllome-desktop-live-a.cfg +# ksflatten -c live-desktop-hypervisor-a.cfg -o ../dishes/phyllome-desktop-live-a.cfg # IMPORTANT : Weak dependencies to be destroyed in the resulting ks # Instructions for livecd-creator (about to be deprecated) @@ -27,9 +27,9 @@ # BIOS test: # qemu-kvm -m 2048 -vga qxl phyllome-desktop-live-a-x86_64.iso -%include live-desktop.cfg # A base for a live desktop minimal machine -%include base-live-hypervisor.cfg # A base hypervisor -%include base-live-hypervisor-a.cfg # Specific virtualization configuration for AMD (tm) CPUs +%include ../ingredients/live-desktop.cfg # A base for a live desktop minimal machine +%include ../ingredients/base-live-hypervisor.cfg # A base hypervisor +%include ../ingredients/base-live-hypervisor-a.cfg # Specific virtualization configuration for AMD (tm) CPUs %packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies. diff --git a/blocks-live/live-desktop-hypervisor-ii.cfg b/recipes/live-desktop-hypervisor-ii.cfg similarity index 86% rename from blocks-live/live-desktop-hypervisor-ii.cfg rename to recipes/live-desktop-hypervisor-ii.cfg index 3d3ce36..cd9745b 100644 --- a/blocks-live/live-desktop-hypervisor-ii.cfg +++ b/recipes/live-desktop-hypervisor-ii.cfg @@ -9,7 +9,7 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c live-desktop-hypervisor-ii.cfg -o ../leaves/phyllome-desktop-live-ii.cfg +# ksflatten -c live-desktop-hypervisor-ii.cfg -o ../dishes/phyllome-desktop-live-ii.cfg # IMPORTANT : Weak dependencies to be destroyed in the resulting ks # Instructions for livecd-creator (about to be deprecated) @@ -27,9 +27,9 @@ # BIOS test: # qemu-kvm -m 2048 -vga qxl phyllome-desktop-live-ii-x86_64.iso -%include live-desktop.cfg # A base for a live desktop minimal machine -%include base-live-hypervisor.cfg # A base hypervisor -%include base-live-hypervisor-ii.cfg # Specific virtualization configuration for Intel(tm) CPUs and Intel(tm) GPUs +%include ../ingredients/live-desktop.cfg # A base for a live desktop minimal machine +%include ../ingredients/base-live-hypervisor.cfg # A base hypervisor +%include ../ingredients/base-live-hypervisor-ii.cfg # Specific virtualization configuration for Intel(tm) CPUs and Intel(tm) GPUs %packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies. diff --git a/blocks-live/live-desktop-hypervisor.cfg b/recipes/live-desktop-hypervisor.cfg similarity index 90% rename from blocks-live/live-desktop-hypervisor.cfg rename to recipes/live-desktop-hypervisor.cfg index 732c14a..cad67f0 100644 --- a/blocks-live/live-desktop-hypervisor.cfg +++ b/recipes/live-desktop-hypervisor.cfg @@ -9,7 +9,7 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c live-desktop-hypervisor.cfg -o ../leaves/phyllome-desktop-live.cfg +# ksflatten -c live-desktop-hypervisor.cfg -o ../dishes/phyllome-desktop-live.cfg # IMPORTANT : Weak dependencies to be destroyed in the resulting ks # Instructions for livecd-creator (about to be deprecated) @@ -27,8 +27,8 @@ # BIOS test: # qemu-kvm -m 2048 -vga qxl phyllome-desktop-live-x86_64.iso -%include live-desktop.cfg # A base for a live desktop minimal machine -%include base-live-hypervisor.cfg # A base hypervisor +%include ../ingredients/live-desktop.cfg # A base for a live desktop minimal machine +%include ../ingredients/base-live-hypervisor.cfg # A base hypervisor %packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies. diff --git a/blocks-live/live-desktop.cfg b/recipes/live-desktop.cfg similarity index 94% rename from blocks-live/live-desktop.cfg rename to recipes/live-desktop.cfg index df4fea2..421a8c5 100644 --- a/blocks-live/live-desktop.cfg +++ b/recipes/live-desktop.cfg @@ -9,7 +9,7 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c live-desktop.cfg -o ../leaves/live-desktop.cfg +# ksflatten -c live-desktop.cfg -o ../dishes/live-desktop.cfg # IMPORTANT : Weak dependencies to be destroyed in the resulting ks # Instructions for livecd-creator (about to be deprecated) @@ -27,8 +27,8 @@ # BIOS test: # qemu-kvm -m 2048 -vga qxl live-desktop-x86_64.iso -%include base-live.cfg # A base for a minimal live machine -%include "../blocks/base-desktop-gnome.cfg" # A base for a desktop environment +%include ../ingredients/base-live.cfg # A base for a minimal live machine +%include ../ingredients//base-desktop-gnome.cfg # A base for a desktop environment %post --log=/root/ld.log # Beginning of %post section. The following commands are executed inside a chroot environment. Add logging diff --git a/blocks/nano.cfg b/recipes/nano.cfg similarity index 66% rename from blocks/nano.cfg rename to recipes/nano.cfg index d128bef..cf4bc3b 100644 --- a/blocks/nano.cfg +++ b/recipes/nano.cfg @@ -9,11 +9,11 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c nano.cfg -o ../leaves/nano-server-a.cfg +# ksflatten -c nano.cfg -o ../dishes/nano-server-a.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include base-nano.cfg # A base system -%include base-initial-setup # Includes initial-setup so on first-boot a new user can be created +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/base-nano.cfg # A base system +%include ../ingredients/base-initial-setup # Includes initial-setup so on first-boot a new user can be created reboot --kexec # Reboot straight into the system after a successfull installation \ No newline at end of file diff --git a/blocks/server-cdrom.cfg b/recipes/server-cdrom.cfg similarity index 65% rename from blocks/server-cdrom.cfg rename to recipes/server-cdrom.cfg index 7530438..c1cbe14 100644 --- a/blocks/server-cdrom.cfg +++ b/recipes/server-cdrom.cfg @@ -9,12 +9,12 @@ # In order to be fed to virt-install or a software like livecd-creator, this file needs to be flattened. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c server-cdrom.cfg -o ../leaves/server-cdrom.cfg +# ksflatten -c server-cdrom.cfg -o ../dishes/server-cdrom.cfg -%include base-fedora-cdrom-repo.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include base.cfg # A base system -%include base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created +%include ../ingredients/base-fedora-cdrom-repo.cfg +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/base.cfg # A base system +%include ../ingredients/base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created reboot --kexec # Reboot straight into the system after a successfull installation diff --git a/blocks/server-hypervisor-amdcpu.cfg b/recipes/server-hypervisor-amdcpu.cfg similarity index 60% rename from blocks/server-hypervisor-amdcpu.cfg rename to recipes/server-hypervisor-amdcpu.cfg index fdaf9db..ab60a04 100644 --- a/blocks/server-hypervisor-amdcpu.cfg +++ b/recipes/server-hypervisor-amdcpu.cfg @@ -9,13 +9,13 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c server-hypervisor-amdcpu.cfg -o ../leaves/phyllome-server-amdcpu.cfg +# ksflatten -c server-hypervisor-amdcpu.cfg -o ../dishes/phyllome-server-amdcpu.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include base.cfg # A minimal machine -%include base-hypervisor.cfg # A base hypervisor -%include base-hypervisor-amdcpu.cfg # Specific virtualization configuration for AMD (tm) CPUs -%include base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/base.cfg # A minimal machine +%include ../ingredients/base-hypervisor.cfg # A base hypervisor +%include ../ingredients/base-hypervisor-amdcpu.cfg # Specific virtualization configuration for AMD (tm) CPUs +%include ../ingredients/base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created reboot --kexec # Reboot straight into the system after a successfull installation \ No newline at end of file diff --git a/blocks/server-hypervisor-intelcpu-intelgpu.cfg b/recipes/server-hypervisor-intelcpu-intelgpu.cfg similarity index 54% rename from blocks/server-hypervisor-intelcpu-intelgpu.cfg rename to recipes/server-hypervisor-intelcpu-intelgpu.cfg index 950e204..ab3c2d1 100644 --- a/blocks/server-hypervisor-intelcpu-intelgpu.cfg +++ b/recipes/server-hypervisor-intelcpu-intelgpu.cfg @@ -9,14 +9,14 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c server-hypervisor-intelcpu-intelgpu.cfg -o ../leaves/phyllome-server-intelcpu-intelgpu.cfg +# ksflatten -c server-hypervisor-intelcpu-intelgpu.cfg -o ../dishes/phyllome-server-intelcpu-intelgpu.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include base.cfg # A minimal machine -%include base-hypervisor.cfg # A base hypervisor -%include base-hypervisor-intelcpu.cfg # Specific virtualization configuration for Intel (tm) CPUs -%include base-hypervisor-intelgpu.cfg # Specific virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev). -%include base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/base.cfg # A minimal machine +%include ../ingredients/base-hypervisor.cfg # A base hypervisor +%include ../ingredients/base-hypervisor-intelcpu.cfg # Specific virtualization configuration for Intel (tm) CPUs +%include ../ingredients/base-hypervisor-intelgpu.cfg # Specific virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev). +%include ../ingredients/base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created reboot --kexec # Reboot straight into the system after a successfull installation diff --git a/blocks/server-hypervisor.cfg b/recipes/server-hypervisor.cfg similarity index 65% rename from blocks/server-hypervisor.cfg rename to recipes/server-hypervisor.cfg index f0482aa..e3ac588 100644 --- a/blocks/server-hypervisor.cfg +++ b/recipes/server-hypervisor.cfg @@ -9,12 +9,12 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c server-hypervisor.cfg -o ../leaves/phyllome-server.cfg +# ksflatten -c server-hypervisor.cfg -o ../dishes/phyllome-server.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include base.cfg # A minimal machine -%include base-hypervisor.cfg # A base hypervisor -%include base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/base.cfg # A minimal machine +%include ../ingredients/base-hypervisor.cfg # A base hypervisor +%include ../ingredients/base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created reboot --kexec # Reboot straight into the system after a successfull installation diff --git a/blocks/server.cfg b/recipes/server.cfg similarity index 69% rename from blocks/server.cfg rename to recipes/server.cfg index 9aa57e8..394cf3d 100644 --- a/blocks/server.cfg +++ b/recipes/server.cfg @@ -9,11 +9,11 @@ # In order to be fed to virt-install or a software like livecd-creator, this file needs to be flattened. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c server.cfg -o ../leaves/server.cfg +# ksflatten -c server.cfg -o ../dishes/server.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include base.cfg # A base system -%include base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/base.cfg # A base system +%include ../ingredients/base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created reboot --kexec # Reboot straight into the system after a successfull installation diff --git a/blocks/virtual-desktop-hypervisor.cfg b/recipes/virtual-desktop-hypervisor.cfg similarity index 52% rename from blocks/virtual-desktop-hypervisor.cfg rename to recipes/virtual-desktop-hypervisor.cfg index ec47d87..24321aa 100644 --- a/blocks/virtual-desktop-hypervisor.cfg +++ b/recipes/virtual-desktop-hypervisor.cfg @@ -9,15 +9,15 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c virtual-desktop-hypervisor.cfg -o ../leaves/virtual-phyllome-desktop.cfg +# ksflatten -c virtual-desktop-hypervisor.cfg -o ../dishes/virtual-phyllome-desktop.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include base.cfg # A minimal machine -%include base-desktop-gnome.cfg # A desktop environment that ships with virtual machine manager -%include base-desktop-virtual-machine-manager.cfg # the virtual machine manager -%include base-hypervisor.cfg # A base hypervisor -%include base-guest-agents.cfg # Guest agents -%include base-initial-setup-gnome.cfg # Includes initial-setup for GNOME +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/base.cfg # A minimal machine +%include ../ingredients/base-desktop-gnome.cfg # A desktop environment that ships with virtual machine manager +%include ../ingredients/base-desktop-virtual-machine-manager.cfg # the virtual machine manager +%include ../ingredients/base-hypervisor.cfg # A base hypervisor +%include ../ingredients/base-guest-agents.cfg # Guest agents +%include ../ingredients/base-initial-setup-gnome.cfg # Includes initial-setup for GNOME reboot --kexec # Reboot straight into the system after a successfull installation \ No newline at end of file diff --git a/blocks/virtual-desktop.cfg b/recipes/virtual-desktop.cfg similarity index 60% rename from blocks/virtual-desktop.cfg rename to recipes/virtual-desktop.cfg index c1dbacd..7d40947 100644 --- a/blocks/virtual-desktop.cfg +++ b/recipes/virtual-desktop.cfg @@ -9,13 +9,13 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c virtual-desktop.cfg -o ../leaves/virtual-desktop.cfg +# ksflatten -c virtual-desktop.cfg -o ../dishes/virtual-desktop.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include base.cfg # A minimal machine -%include base-desktop-gnome.cfg # A desktop environment -%include base-guest-agents.cfg # Guest agents -%include base-initial-setup-gnome.cfg # Includes initial-setup for GNOME +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/base.cfg # A minimal machine +%include ../ingredients/base-desktop-gnome.cfg # A desktop environment +%include ../ingredients/base-guest-agents.cfg # Guest agents +%include ../ingredients/base-initial-setup-gnome.cfg # Includes initial-setup for GNOME reboot --kexec # Reboot straight into the system after a successfull installation \ No newline at end of file diff --git a/blocks/virtual-server-encrypted.cfg b/recipes/virtual-server-encrypted.cfg similarity index 68% rename from blocks/virtual-server-encrypted.cfg rename to recipes/virtual-server-encrypted.cfg index fc4c6c5..2acf7d4 100644 --- a/blocks/virtual-server-encrypted.cfg +++ b/recipes/virtual-server-encrypted.cfg @@ -11,13 +11,13 @@ # In order to be fed to virt-install or a software like livecd-creator, this file needs to be flattened. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c virtual-server-encrypted.cfg -o ../leaves/virtual-server-encrypted.cfg +# ksflatten -c virtual-server-encrypted.cfg -o ../dishes/virtual-server-encrypted.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage-encrypted.cfg # base encrypted storage -%include base.cfg # A base system -%include base-guest-agents.cfg # Guest agents -%include base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage-encrypted.cfg # base encrypted storage +%include ../ingredients/base.cfg # A base system +%include ../ingredients/base-guest-agents.cfg # Guest agents +%include ../ingredients/base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created reboot --kexec # Reboot straight into the system after a successfull installation diff --git a/blocks/virtual-server.cfg b/recipes/virtual-server.cfg similarity index 63% rename from blocks/virtual-server.cfg rename to recipes/virtual-server.cfg index 41fba3c..4f06102 100644 --- a/blocks/virtual-server.cfg +++ b/recipes/virtual-server.cfg @@ -9,12 +9,12 @@ # In order to be fed to virt-install or a software like livecd-creator, this file needs to be flattened. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c virtual-server.cfg -o ../leaves/virtual-server.cfg +# ksflatten -c virtual-server.cfg -o ../dishes/virtual-server.cfg -%include base-fedora-repo.cfg # offical repositories for Fedora -%include base-storage.cfg # base storage -%include base.cfg # A base system -%include base-guest-agents.cfg # Guest agents -%include base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-storage.cfg # base storage +%include ../ingredients/base.cfg # A base system +%include ../ingredients/base-guest-agents.cfg # Guest agents +%include ../ingredients/base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created reboot --kexec # Reboot straight into the system after a successfull installation \ No newline at end of file