nocore everywhere

Reviewed-on: #4

dishes/desktop-hypervisor-amdcpu.cfg

@@ -230,7 +230,7 @@ echo "options kvm_amd nested=1" >> /mnt/sysimage/etc/modprobe.d/kvm.conf # Add s
 
 %end
 
-%packages --exclude-weakdeps
+%packages --nocore --exclude-weakdeps
 NetworkManager
 NetworkManager-config-connectivity-fedora
 NetworkManager-wifi

dishes/desktop-hypervisor-intelcpu-intelgpu.cfg

@@ -240,7 +240,7 @@ echo "vfio-mdev" > /mnt/sysimage/etc/modules-load.d/vfio-mdev.conf # Load specif
 
 %end
 
-%packages --exclude-weakdeps
+%packages --nocore --exclude-weakdeps
 NetworkManager
 NetworkManager-config-connectivity-fedora
 NetworkManager-wifi

dishes/desktop-hypervisor-intelcpu.cfg

@@ -230,7 +230,7 @@ echo "options kvm_intel nested=1" >> /mnt/sysimage/etc/modprobe.d/kvm.conf # Add
 
 %end
 
-%packages --exclude-weakdeps
+%packages --nocore --exclude-weakdeps
 NetworkManager
 NetworkManager-config-connectivity-fedora
 NetworkManager-wifi

dishes/desktop-hypervisor.cfg

@@ -222,7 +222,7 @@ mkdir /mnt/sysimage/var/lib/libvirt/isos # Create a directory to store iso image
 
 %end
 
-%packages --exclude-weakdeps
+%packages --nocore --exclude-weakdeps
 NetworkManager
 NetworkManager-config-connectivity-fedora
 NetworkManager-wifi

dishes/desktop.cfg

@@ -129,7 +129,7 @@ glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/
 
 %end
 
-%packages --exclude-weakdeps
+%packages --nocore --exclude-weakdeps
 NetworkManager
 NetworkManager-config-connectivity-fedora
 NetworkManager-wifi

dishes/live-desktop-hypervisor.cfg

@@ -278,7 +278,7 @@ mkdir /mnt/sysimage/var/lib/libvirt/isos # Create a directory to store iso image
 
 %end
 
-%packages --exclude-weakdeps
+%packages --nocore --exclude-weakdeps
 @anaconda-tools
 NetworkManager
 NetworkManager-config-connectivity-fedora

dishes/live-desktop.cfg

@@ -185,7 +185,7 @@ glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/
 
 %end
 
-%packages --exclude-weakdeps
+%packages --nocore --exclude-weakdeps
 @anaconda-tools
 NetworkManager
 NetworkManager-config-connectivity-fedora

dishes/live-server-hypervisor.cfg

@@ -130,7 +130,7 @@ mkdir /mnt/sysimage/var/lib/libvirt/isos # Create a directory to store iso image
 
 %end
 
-%packages --exclude-weakdeps
+%packages --nocore --exclude-weakdeps
 @anaconda-tools
 NetworkManager
 NetworkManager-config-connectivity-fedora

dishes/live-server.cfg

@@ -100,7 +100,7 @@ sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys
 
 %end
 
-%packages --exclude-weakdeps
+%packages --nocore --exclude-weakdeps
 @anaconda-tools
 NetworkManager
 NetworkManager-config-connectivity-fedora

dishes/virtual-desktop-hypervisor.cfg

@@ -199,7 +199,7 @@ mkdir /mnt/sysimage/var/lib/libvirt/isos # Create a directory to store iso image
 
 %end
 
-%packages --exclude-weakdeps
+%packages --nocore --exclude-weakdeps
 NetworkManager
 NetworkManager-config-connectivity-fedora
 NetworkManager-wifi

dishes/virtual-desktop.cfg

@@ -106,7 +106,7 @@ glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/
 
 %end
 
-%packages --exclude-weakdeps
+%packages --nocore --exclude-weakdeps
 NetworkManager
 NetworkManager-config-connectivity-fedora
 NetworkManager-wifi

dishes/virtual-server-hypervisor.cfg

@@ -65,7 +65,7 @@ mkdir /mnt/sysimage/var/lib/libvirt/isos # Create a directory to store iso image
 
 %end
 
-%packages --exclude-weakdeps
+%packages --nocore --exclude-weakdeps
 NetworkManager
 NetworkManager-config-connectivity-fedora
 audit

dishes/virtual-server.cfg

@@ -35,7 +35,7 @@ part /boot/efi --fstype="efi" --size=2048 --fsoptions="umask=0077,shortname=winn
 part /boot --fstype="ext4" --size=512 --label=boot
 part / --fstype="ext4" --grow --label=root --mkfsoptions="-O encrypt,fast_commit"
 
-%packages --exclude-weakdeps
+%packages --nocore --exclude-weakdeps
 NetworkManager
 NetworkManager-config-connectivity-fedora
 audit

ingredients/base-desktop-gnome.cfg

@@ -1,6 +1,6 @@
 xconfig --startxonboot --defaultdesktop=GNOME # Start the display session on boot. Although it says --startx, which seems to imply xorg, it is actually generic and thus works also with Wayland.
 
-%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak dependencies
+%packages --nocore --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies or the core packages. Description courtesy of the Fedora project
 
 gnome-shell # the version 3 of the GNOME desktop environment, without any presintalled applications
 gnome-terminal # install the default terminal for GNOME Shell

ingredients/base-desktop-virtual-machine-manager.cfg

@@ -1,4 +1,4 @@
-%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies
+%packages --nocore --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies or the core packages. Description courtesy of the Fedora project
 
 virt-manager # Install virt-manager, a graphical front-end for QEMU/KVM
 

ingredients/base-guest-agents.cfg

@@ -1,4 +1,4 @@
-%packages --exclude-weakdeps # Beginning of the packages section. Does not include weak dependencies.
+%packages --nocore --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies or the core packages. Description courtesy of the Fedora project
 
 qemu-guest-agent # "QEMU guest agent" The qemu-guest agent is unnecessary for a bare-metal system. However, it is included here to cover cases where this kickstart file is used to deploy a virtual machine 
 spice-vdagent # "Agent for Spice guests" The spice agent is unnecessary for a bare-metal system. However, it is included here to cover cases where this kickstart file is used to deploy a virtual machine 

ingredients/base-hypervisor.cfg

@@ -1,6 +1,6 @@
 services --enabled="NetworkManager,systemd-resolved,libvirtd" # Without libvirtd here, it appears the service won't automatically start
 
-%packages --exclude-weakdeps # Beginning of the packages section. Does not include weak dependencies.
+%packages --nocore --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies or the core packages. Description courtesy of the Fedora project
 
 qemu-kvm # QEMU metapackage for KVM support
 libvirt # Library providing a simple virtualization API

ingredients/core-initial-setup-desktop.cfg

@@ -1,6 +1,6 @@
 firstboot --enable --reconfig # Initial Setup will start after the first reboot
 
-%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies.
+%packages --nocore --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies or the core packages. Description courtesy of the Fedora project
 
 gnome-initial-setup # Add GNOME initial setup too to let user create local account.
 

ingredients/core-initial-setup-server.cfg

@@ -1,6 +1,6 @@
 firstboot --enable --reconfig # Enable the Setup Agent to start at boot time in reconfiguration mode. This mode enables the language, mouse, keyboard, root password, security level, time zone, and networking configuration options in addition to the default ones
 
-%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies
+%packages --nocore --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies or the core packages. Description courtesy of the Fedora project
 
 initial-setup # Initial setup package
 

ingredients/core-packages-default.cfg

@@ -1,4 +1,4 @@
-%packages --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies. Description courtesy of the Fedora project
+%packages --nocore --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies or the core packages. Description courtesy of the Fedora project
 
 # Default packages fom core dnf group not marked as mandatory (`dnf group info --hidden core`)
 NetworkManager # Network connection manager and user applications

ingredients/core-packages-hardware-support.cfg

@@ -7,7 +7,7 @@
 #
 # Provides extended hardware support
 
-%packages --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies
+%packages --nocore --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies or the core packages. Description courtesy of the Fedora project
 
 # hardware-support group. Mandatory packages # Provides extended hardware support, and especially extra wireless drivers
 alsa-sof-firmware # Audio drivers and firmware for ALSA. Essential for audio functionality.

ingredients/core-packages-mandatory.cfg

@@ -8,7 +8,7 @@
 # Provides the mandatory packages that are part of the core DNF group
 # More information: https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html#id240
 
-%packages --ignoremissing --nocore --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies. Description courtesy of the Fedora project
+%packages --nocore --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies or the core packages. Description courtesy of the Fedora project
 
 # Mandatory packages found in hidden `core` group (`dnf group info --hidden core`)
 audit # User space tools for kernel auditing

scripts/deploy-distro.sh

@@ -4,6 +4,28 @@
 DEFAULT_MEMORY=4096
 DEFAULT_DISK_SIZE=10
 
+# Function to find Fedora ISO
+find_fedora_iso() {
+    local iso_dir="/var/lib/libvirt/isos"
+    local fedora_iso=""
+    
+    # Check if directory exists
+    if [ -d "$iso_dir" ]; then
+        # Find the first Fedora-Server*.iso file
+        fedora_iso=$(find "$iso_dir" -maxdepth 1 -name "Fedora-Server*.iso" -type f | head -n 1)
+        
+        # If found, return the full path
+        if [ -n "$fedora_iso" ] && [ -f "$fedora_iso" ]; then
+            echo "$fedora_iso"
+            return 0
+        fi
+    fi
+    
+    # Return empty if no ISO found
+    echo ""
+    return 1
+}
+
 # Prompt user for VM memory size
 read -r -p "Provide desired VM memory in MB or press Enter to keep default value of $DEFAULT_MEMORY MB): " memory_size
 memory_size=${memory_size:-$DEFAULT_MEMORY}
@@ -98,6 +120,16 @@ vm_name="${dish_name[$((choice - 1))]}"
 # Output the selected filename
 echo "You selected: $vm_name"
 
+# Find Fedora ISO or use default location
+fedora_iso=$(find_fedora_iso)
+if [ -n "$fedora_iso" ]; then
+    location_param="$fedora_iso"
+    echo "Using local ISO: $fedora_iso"
+else
+    location_param="https://download.fedoraproject.org/pub/fedora/linux/releases/43/Everything/x86_64/os/"
+    echo "Using default online repository"
+fi
+
 # virt-install command with user-defined VM name
 virt-install \
     --connect "$uri" \
@@ -129,7 +161,7 @@ virt-install \
     --watchdog none \
     --memballoon none \
     --disk path="${disk_path}/${vm_name}.img",format=raw,bus=virtio,cache=writeback,size="$disk_size" \
-    --location=https://download.fedoraproject.org/pub/fedora/linux/releases/43/Everything/x86_64/os/ \
+    --location="$location_param" \
     --initrd-inject ./dishes/"$vm_name".cfg \
     --extra-args "inst.ks=file:/$vm_name.cfg"