add ability to pick memory and disk size

add pipewire and gnome-control-center to desktop editions
move file
2025-05-29 17:49:30 +02:00 · 2025-05-29 17:48:59 +02:00 · 2025-05-29 17:48:37 +02:00
12 changed files with 66 additions and 2 deletions
--- a/recipes/_list-of-ingredients.cfg
+++ b/recipes/_list-of-ingredients.cfg
--- a/dishes/desktop-hypervisor-amdcpu.cfg
+++ b/dishes/desktop-hypervisor-amdcpu.cfg
@ -265,6 +265,7 @@ generic-release-common
 generic-release-notes
 glibc
 gnome-backgrounds.noarch
+gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
@ -299,6 +300,9 @@ openssh-clients
 openssh-server
 parted
 pciutils
+pipewire-alsa
+pipewire-jack-audio-connection-kit
+pipewire-pulseaudio
 plymouth
 policycoreutils
 prefixdevname
--- a/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg
+++ b/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg
@ -275,6 +275,7 @@ generic-release-common
 generic-release-notes
 glibc
 gnome-backgrounds.noarch
+gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
@ -309,6 +310,9 @@ openssh-clients
 openssh-server
 parted
 pciutils
+pipewire-alsa
+pipewire-jack-audio-connection-kit
+pipewire-pulseaudio
 plymouth
 policycoreutils
 prefixdevname
--- a/dishes/desktop-hypervisor-intelcpu.cfg
+++ b/dishes/desktop-hypervisor-intelcpu.cfg
@ -265,6 +265,7 @@ generic-release-common
 generic-release-notes
 glibc
 gnome-backgrounds.noarch
+gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
@ -299,6 +300,9 @@ openssh-clients
 openssh-server
 parted
 pciutils
+pipewire-alsa
+pipewire-jack-audio-connection-kit
+pipewire-pulseaudio
 plymouth
 policycoreutils
 prefixdevname
--- a/dishes/desktop-hypervisor.cfg
+++ b/dishes/desktop-hypervisor.cfg
@ -257,6 +257,7 @@ generic-release-common
 generic-release-notes
 glibc
 gnome-backgrounds.noarch
+gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
@ -291,6 +292,9 @@ openssh-clients
 openssh-server
 parted
 pciutils
+pipewire-alsa
+pipewire-jack-audio-connection-kit
+pipewire-pulseaudio
 plymouth
 policycoreutils
 prefixdevname
--- a/dishes/desktop.cfg
+++ b/dishes/desktop.cfg
@ -164,6 +164,7 @@ generic-release-common
 generic-release-notes
 glibc
 gnome-backgrounds.noarch
+gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
@ -193,6 +194,9 @@ openssh-clients
 openssh-server
 parted
 pciutils
+pipewire-alsa
+pipewire-jack-audio-connection-kit
+pipewire-pulseaudio
 plymouth
 policycoreutils
 prefixdevname
--- a/dishes/live-desktop-hypervisor.cfg
+++ b/dishes/live-desktop-hypervisor.cfg
@ -317,6 +317,7 @@ generic-release-notes
 glibc
 glibc-all-langpacks
 gnome-backgrounds.noarch
+gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
@ -354,6 +355,9 @@ openssh-clients
 openssh-server
 parted
 pciutils
+pipewire-alsa
+pipewire-jack-audio-connection-kit
+pipewire-pulseaudio
 plymouth
 policycoreutils
 prefixdevname
--- a/dishes/live-desktop.cfg
+++ b/dishes/live-desktop.cfg
@ -224,6 +224,7 @@ generic-release-notes
 glibc
 glibc-all-langpacks
 gnome-backgrounds.noarch
+gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
@ -256,6 +257,9 @@ openssh-clients
 openssh-server
 parted
 pciutils
+pipewire-alsa
+pipewire-jack-audio-connection-kit
+pipewire-pulseaudio
 plymouth
 policycoreutils
 prefixdevname
--- a/dishes/virtual-desktop-hypervisor.cfg
+++ b/dishes/virtual-desktop-hypervisor.cfg
@ -250,6 +250,7 @@ generic-release-common
 generic-release-notes
 glibc
 gnome-backgrounds.noarch
+gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
@ -274,6 +275,9 @@ openssh-clients
 openssh-server
 parted
 pciutils
+pipewire-alsa
+pipewire-jack-audio-connection-kit
+pipewire-pulseaudio
 plymouth
 policycoreutils
 prefixdevname
--- a/dishes/virtual-desktop.cfg
+++ b/dishes/virtual-desktop.cfg
@ -157,6 +157,7 @@ generic-release-common
 generic-release-notes
 glibc
 gnome-backgrounds.noarch
+gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
@ -176,6 +177,9 @@ openssh-clients
 openssh-server
 parted
 pciutils
+pipewire-alsa
+pipewire-jack-audio-connection-kit
+pipewire-pulseaudio
 plymouth
 policycoreutils
 prefixdevname
--- a/ingredients/base-desktop-gnome.cfg
+++ b/ingredients/base-desktop-gnome.cfg
@ -4,6 +4,7 @@ xconfig --startxonboot --defaultdesktop=GNOME # Start the display session on boo

 gnome-shell # the version 3 of the GNOME desktop environment, without any presintalled applications
 gnome-terminal # install the default terminal for GNOME Shell
+gnome-control-center # Utilities to configure the GNOME desktop
 -gnome-tour # delete GNOME Tour so it doesn't automatically launch on boot 
 mesa-dri-drivers # add mesa drivers otherwise there is a blank screen when first booting a desktop-based kickstart without virtualization tools 
 dejavu-sans-mono-fonts # the gnome-shell package doesn't include much fonts by default, resulting in weird spacings in GNOME Terminal. GNOME Terminal unfortunately doesn't automatically pick this font 
@ -12,6 +13,9 @@ wpa_supplicant # WPA Supplicant for Linux. It is not packaged by default in GNOM
 NetworkManager-wifi # Provides the plugin to manage Wireless networking within GNOME Shell
 firefox # Internet browser
 mozilla-ublock-origin.noarch # An efficient ad blocker for Firefox
+pipewire-alsa # PipeWire media server ALSA support
+pipewire-pulseaudio # PipeWire PulseAudio implementation
+pipewire-jack-audio-connection-kit # PipeWire JACK implementation

 %end # End of the packagages section

--- a/scripts/deploy-distro.sh
+++ b/scripts/deploy-distro.sh
@ -1,5 +1,29 @@
 #!/bin/bash

+# Default values
+DEFAULT_MEMORY=4096
+DEFAULT_DISK_SIZE=10
+
+# Prompt user for memory size
+read -r -p "Enter memory size in MB or press Enter to keep default value: $DEFAULT_MEMORY): " memory_size
+memory_size=${memory_size:-$DEFAULT_MEMORY}
+
+# Validate memory size
+if ! [[ "$memory_size" =~ ^[0-9]+$ ]] || (( memory_size < 2048 )); then
+    echo "Invalid memory size.  Must be a number greater than or equal to 2048. Using default value of $DEFAULT_MEMORY."
+    memory_size=$DEFAULT_MEMORY
+fi
+
+# Prompt user for disk size
+read -r -p "Enter disk size in GB (default: $DEFAULT_DISK_SIZE): " disk_size
+disk_size=${disk_size:-$DEFAULT_DISK_SIZE}
+
+# Validate disk size
+if ! [[ "$disk_size" =~ ^[0-9]+$ ]] || (( disk_size < 10 )); then
+    echo "Invalid disk size.  Must be a number greater than or equal to 10 GiB. Using default value of $DEFAULT_DISK_SIZE."
+    disk_size=$DEFAULT_DISK_SIZE
+fi
+
 # Get a list of files in the directory dishes without extensions
 mapfile -t dish_name < <(find "dishes/" -maxdepth 1 -type f -printf "%f\n" | sed 's/\.[^.]*$//')

@ -41,7 +65,7 @@ virt-install \
    --boot uefi \
    --cpu host-model,topology.sockets=1,topology.cores=2,topology.threads=2 \
    --vcpus 4 \
-    --memory 4096 \
+    --memory "$memory_size" \
    --video virtio \
    --channel unix,target.type=virtio,target.name=org.qemu.guest_agent.0 \
    --autoconsole none \
@ -54,7 +78,7 @@ virt-install \
    --input type=keyboard,bus=virtio \
    --input type=tablet,bus=virtio \
    --rng /dev/urandom,model=virtio \
-    --disk path=/var/lib/libvirt/images/"$vm_name".img,format=raw,bus=virtio,cache=writeback,size=10 \
+    --disk path=/var/lib/libvirt/images/"$vm_name".img,format=raw,bus=virtio,cache=writeback,size="$disk_size" \
    --location=https://download.fedoraproject.org/pub/fedora/linux/releases/42/Everything/x86_64/os/ \
    --initrd-inject ./dishes/"$vm_name".cfg \
    --extra-args "inst.ks=file:/$vm_name.cfg"
Author	SHA1	Message	Date
Lukas Greve	c458ab4b5c	add ability to pick memory and disk size	2025-05-29 17:49:30 +02:00
Lukas Greve	02f2a131bf	add pipewire and gnome-control-center to desktop editions	2025-05-29 17:48:59 +02:00
Lukas Greve	6cfad2d5eb	move file	2025-05-29 17:48:37 +02:00