From 0752b2288b64d595a25a2035b73ed54e3a9381be Mon Sep 17 00:00:00 2001 From: Lukas Greve Date: Thu, 11 Dec 2025 00:03:30 +0100 Subject: [PATCH] try minification --- dishes/virtual-server.cfg | 66 +------------------- ingredients/core-bootloader-systemd-boot.cfg | 2 +- ingredients/core-packages-default.cfg | 23 ------- ingredients/core-packages-mandatory.cfg | 45 ------------- ingredients/core-packages.cfg | 64 +++++++++++++++++++ recipes/virtual-desktop-hypervisor.cfg | 2 - recipes/virtual-desktop.cfg | 2 - recipes/virtual-nano.cfg | 16 +++++ recipes/virtual-server-hypervisor.cfg | 2 - 9 files changed, 84 insertions(+), 138 deletions(-) delete mode 100644 ingredients/core-packages-default.cfg delete mode 100644 ingredients/core-packages-mandatory.cfg create mode 100644 ingredients/core-packages.cfg create mode 100644 recipes/virtual-nano.cfg diff --git a/dishes/virtual-server.cfg b/dishes/virtual-server.cfg index 2c9fc56..ee00029 100644 --- a/dishes/virtual-server.cfg +++ b/dishes/virtual-server.cfg @@ -2,106 +2,46 @@ #version=DEVEL # Use text mode install text -# Firewall configuration -firewall --disabled -# Run the Setup Agent on first boot -firstboot --reconfig # Keyboard layouts keyboard --xlayouts='ch (fr)' # System language lang en_US.UTF-8 -# Network information -network --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate # Shutdown after installation shutdown repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-43&arch=x86_64 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f43&arch=x86_64 # Root password -rootpw --iscrypted --lock locked -# SELinux configuration -selinux --disabled -# System services -services --enabled="NetworkManager,systemd-resolved" +rootpw --plaintext 1234 # Root account is enabled with weak password # System timezone timezone Europe/Zurich --utc # Use network installation url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-43&arch=x86_64" # System bootloader configuration -bootloader --location=mbr --timeout=1 +bootloader --sdboot # Clear the Master Boot Record zerombr # Partition clearing information clearpart --all --initlabel # Disk partitioning information part /boot/efi --fstype="efi" --size=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi -part /boot --fstype="ext4" --size=512 --label=boot part / --fstype="ext4" --grow --label=root -%post --logfile=/mnt/sysimage/root/post.log - -localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked. -dnf update -y # Update the system - -%end - -%packages --exclude-weakdeps -NetworkManager -NetworkManager-config-connectivity-fedora -audit +%packages --nocore --inst-langs=en --exclude-weakdeps basesystem bash -coreutils -curl -dhcp-client -dnf5 -dnf5-plugins dracut -dracut-config-rescue -e2fsprogs fedora-remix-logos filesystem -firewalld -fwupd generic-logos generic-release generic-release-common generic-release-notes glibc -hostname -initial-setup -iproute -iputils -kbd kernel -less -libusb -man-db -nano -ncurses -openssh-clients -openssh-server -parted -pciutils -plymouth -policycoreutils -prefixdevname -procps-ng -qemu-guest-agent rootfiles rpm -selinux-policy-targeted setup -shadow-utils -spice-vdagent -sssd-common -sssd-kcm -sudo systemd -systemd-resolved -usbutils -util-linux -vim-minimal -wget zram-generator-defaults %end diff --git a/ingredients/core-bootloader-systemd-boot.cfg b/ingredients/core-bootloader-systemd-boot.cfg index 225679d..85357f6 100644 --- a/ingredients/core-bootloader-systemd-boot.cfg +++ b/ingredients/core-bootloader-systemd-boot.cfg @@ -1 +1 @@ -bootloader --sdboot --location=mbr --timeout=1 # Use systemd-boot and set a timeout to 1 \ No newline at end of file +bootloader --sdboot --timeout=1 # Use systemd-boot and set a timeout to 1 \ No newline at end of file diff --git a/ingredients/core-packages-default.cfg b/ingredients/core-packages-default.cfg deleted file mode 100644 index af078a0..0000000 --- a/ingredients/core-packages-default.cfg +++ /dev/null @@ -1,23 +0,0 @@ -%packages --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies. 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 -NetworkManager-config-connectivity-fedora # NetworkManager config file for connectivity checking via Fedora servers -dnf5-plugins # Plugins for dnf5 -dracut-config-rescue # dracut configuration to turn on rescue image generation -firewalld # A firewall daemon with D-Bus interface providing a dynamic firewall -fwupd # Firmware update daemon -plymouth # Graphical Boot Animation and Logger -prefixdevname # Udev helper utility that provides network interface naming using user defined prefix -systemd-resolved # Network Name Resolution manager -zram-generator-defaults # Default configuration for zram-generator - -# Hand-picked packages -pciutils # PCI bus related utilities -libusb # Library for accessing USB devices -usbutils # Linux USB utilities -curl # transfer a URL -wget # An advanced file and recursive website downloader -nano # A small text editor - -%end # End of the packages section \ No newline at end of file diff --git a/ingredients/core-packages-mandatory.cfg b/ingredients/core-packages-mandatory.cfg deleted file mode 100644 index f4ddc99..0000000 --- a/ingredients/core-packages-mandatory.cfg +++ /dev/null @@ -1,45 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ -# -# 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 - -# Mandatory packages found in hidden `core` group (`dnf group info --hidden core`) -basesystem # The skeleton package which defines a simple Fedora system -bash # The Bourne Again SHell, a command-line interpreter. -curl # A utility for getting files from remote servers (FTP, HTTP, and others) -dhcp-client # Provides the ISC DHCP client daemon and dhclient-script -dnf5 # Command-line package manager -dracut # Initramfs generator using udev -filesystem # The basic directory layout for a Linux system -glibc # The GNU libc libraries -hostname # Utility to set/show the host name or domain name -iproute # Advanced IP routing and network device configuration tools -iputils # Network monitoring tools including ping -kbd # Tools for configuring the console (keyboard, virtual terminals, etc.) -kernel # The Linux kernel -ncurses # Ncurses support utilities -parted # The GNU disk partition manipulation program -procps-ng # System and process monitoring utilities -rootfiles # The basic required files for the root user's directory -rpm # The RPM package management system -setup # A set of system configuration and setup files -shadow-utils # Utilities for managing accounts and shadow password files -systemd # System and Service Manager -util-linux # Collection of basic system utilities - -# Packages to make Phyllome OS a generic distro -# Adds packages to comply with Fedora Remix legal guidelines: https://fedoraproject.org/wiki/Remix -fedora-remix-logos # Fedora Remix logos -generic-release # Generic release files -generic-logos # Icons and pictures -generic-release-common # Generic release files -generic-release-notes # Release Notes - -%end # End of the packages section \ No newline at end of file diff --git a/ingredients/core-packages.cfg b/ingredients/core-packages.cfg new file mode 100644 index 0000000..9b0f330 --- /dev/null +++ b/ingredients/core-packages.cfg @@ -0,0 +1,64 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ +# +# 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 --excludedocs --inst-langs=en --nocore --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies. Description courtesy of the Fedora project + +# Mandatory packages found in hidden `core` group (`dnf group info --hidden core`) +basesystem # The skeleton package which defines a simple Fedora system +bash # The Bourne Again SHell, a command-line interpreter. +curl # A utility for getting files from remote servers (FTP, HTTP, and others) +# dhcp-client # Provides the ISC DHCP client daemon and dhclient-script +dnf5 # Command-line package manager +dracut # Initramfs generator using udev +filesystem # The basic directory layout for a Linux system +glibc # The GNU libc libraries +# hostname # Utility to set/show the host name or domain name +# iproute # Advanced IP routing and network device configuration tools +# iputils # Network monitoring tools including ping +# kbd # Tools for configuring the console (keyboard, virtual terminals, etc.) +kernel # The Linux kernel +# ncurses # Ncurses support utilities +# parted # The GNU disk partition manipulation program +# procps-ng # System and process monitoring utilities +rootfiles # The basic required files for the root user's directory +rpm # The RPM package management system +setup # A set of system configuration and setup files +shadow-utils # Utilities for managing accounts and shadow password files +systemd # System and Service Manager +# util-linux # Collection of basic system utilities + +# Default packages fom core dnf group not marked as mandatory (`dnf group info --hidden core`) +# NetworkManager # Network connection manager and user applications +# NetworkManager-config-connectivity-fedora # NetworkManager config file for connectivity checking via Fedora servers +# dnf5-plugins # Plugins for dnf5 +# dracut-config-rescue # dracut configuration to turn on rescue image generation +# firewalld # A firewall daemon with D-Bus interface providing a dynamic firewall +# fwupd # Firmware update daemon +# plymouth # Graphical Boot Animation and Logger +# prefixdevname # Udev helper utility that provides network interface naming using user defined prefix +# systemd-resolved # Network Name Resolution manager +zram-generator-defaults # Default configuration for zram-generator + +# Hand-picked packages +# pciutils # PCI bus related utilities +# libusb # Library for accessing USB devices +# usbutils # Linux USB utilities +# wget # An advanced file and recursive website downloader +# nano # A small text editor + +# Packages to make Phyllome OS a generic distro +# Adds packages to comply with Fedora Remix legal guidelines: https://fedoraproject.org/wiki/Remix +fedora-remix-logos # Fedora Remix logos +generic-release # Generic release files +generic-logos # Icons and pictures +generic-release-common # Generic release files +generic-release-notes # Release Notes + +%end # End of the packages section \ No newline at end of file diff --git a/recipes/virtual-desktop-hypervisor.cfg b/recipes/virtual-desktop-hypervisor.cfg index c0b9c36..388ba4a 100644 --- a/recipes/virtual-desktop-hypervisor.cfg +++ b/recipes/virtual-desktop-hypervisor.cfg @@ -17,8 +17,6 @@ %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-fedora-repo-43.cfg # Offical repositories for Fedora -%include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-desktop.cfg # OEM setup for GNOME Shell %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager %include ../ingredients/base-hypervisor.cfg # Base hypervisor diff --git a/recipes/virtual-desktop.cfg b/recipes/virtual-desktop.cfg index f6533ce..528f4ec 100644 --- a/recipes/virtual-desktop.cfg +++ b/recipes/virtual-desktop.cfg @@ -17,7 +17,5 @@ %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-fedora-repo-43.cfg # Offical repositories for Fedora -%include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-desktop.cfg # OEM setup for GNOME Shell %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment %include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file diff --git a/recipes/virtual-nano.cfg b/recipes/virtual-nano.cfg new file mode 100644 index 0000000..d937ba5 --- /dev/null +++ b/recipes/virtual-nano.cfg @@ -0,0 +1,16 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ + +# A recipe for a virtual server + +%include ../ingredients/core.cfg # Text mode +%include ../ingredients/core-storage.cfg # ext4-based storage configuration +%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to sdboot +%include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language +%include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux +%include ../ingredients/core-packages.cfg # Mandatory packages +%include ../ingredients/core-fedora-repo-43.cfg # Offical repositories for Fedora \ No newline at end of file diff --git a/recipes/virtual-server-hypervisor.cfg b/recipes/virtual-server-hypervisor.cfg index eef471c..cbfe076 100644 --- a/recipes/virtual-server-hypervisor.cfg +++ b/recipes/virtual-server-hypervisor.cfg @@ -17,7 +17,5 @@ %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-fedora-repo-43.cfg # Offical repositories for Fedora -%include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-server.cfg # For headless systems %include ../ingredients/base-hypervisor.cfg # Base hypervisor %include ../ingredients/base-guest-agents.cfg # Guest agents