From d3809066a812215cfe08b48b1938f3615e7a8472 Mon Sep 17 00:00:00 2001 From: luz Date: Tue, 6 May 2025 09:38:18 -0500 Subject: [PATCH] change location of logs, mostly --- ingredients/base-desktop-gnome.cfg | 11 +---------- ingredients/base-desktop-virtual-machine-manager.cfg | 11 +---------- ingredients/base-guest-agents.cfg | 9 --------- ingredients/base-hypervisor-amdcpu.cfg | 11 +---------- ingredients/base-hypervisor-intelcpu.cfg | 11 +---------- ingredients/base-hypervisor-intelgpu.cfg | 12 +----------- ingredients/base-hypervisor.cfg | 11 +---------- ingredients/core-packages-default.cfg | 9 --------- ingredients/core-post-nochroot.cfg | 10 ---------- ingredients/core-post.cfg | 10 ---------- ingredients/core-pre-install.cfg | 10 ---------- ingredients/core-pre.cfg | 10 ---------- ingredients/live-core-bootloader-grub.cfg | 9 --------- ingredients/live-core-mandatory-packages.cfg | 9 --------- ingredients/live-core-post-live-session.cfg | 9 --------- ingredients/live-core-post.cfg | 11 +---------- ingredients/live-core-storage.cfg | 12 +----------- ingredients/live-core.cfg | 11 ----------- 18 files changed, 8 insertions(+), 178 deletions(-) diff --git a/ingredients/base-desktop-gnome.cfg b/ingredients/base-desktop-gnome.cfg index 5a28af2..966d482 100644 --- a/ingredients/base-desktop-gnome.cfg +++ b/ingredients/base-desktop-gnome.cfg @@ -1,12 +1,3 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? This kickstart file provides a basic block to build a minimal and customized desktop-oriented operating system using GNOME Shell. - 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 @@ -24,7 +15,7 @@ mozilla-ublock-origin.noarch # An efficient ad blocker for Firefox %end # End of the packagages section -%post --nochroot --log=/mnt/sysimage/opt/base-desktop-gnome.log # Beginning of %post section. Those commands are executed outside the chroot environment +%post --nochroot --log=/mnt/sysimage/root/base-desktop-gnome.log # Beginning of %post section. Those commands are executed outside the chroot environment # cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.background.gschema.override<< EOF # [org.gnome.desktop.background] diff --git a/ingredients/base-desktop-virtual-machine-manager.cfg b/ingredients/base-desktop-virtual-machine-manager.cfg index 4e795a4..4f108c3 100644 --- a/ingredients/base-desktop-virtual-machine-manager.cfg +++ b/ingredients/base-desktop-virtual-machine-manager.cfg @@ -1,19 +1,10 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? This kickstart file provides a virtual machine manager, sets it to auto-launch and tweaked it. - %packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies virt-manager # Install virt-manager, a graphical front-end for QEMU/KVM %end -%post --nochroot --log=/mnt/sysimage/opt/base-desktop-gnome-virtual-machine-manager.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging. +%post --nochroot --log=/mnt/sysimage/root/base-desktop-gnome-virtual-machine-manager.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging. # Create a file to autostart virt-manager cat > /mnt/sysimage/etc/xdg/autostart/virt-manager.desktop << EOF diff --git a/ingredients/base-guest-agents.cfg b/ingredients/base-guest-agents.cfg index 5b34351..91571f9 100644 --- a/ingredients/base-guest-agents.cfg +++ b/ingredients/base-guest-agents.cfg @@ -1,12 +1,3 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? This kickstart file provides guest-agents, which are useful for virtual machines - %packages --exclude-weakdeps # Beginning of the packages section. Does not include weak dependencies. 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 diff --git a/ingredients/base-hypervisor-amdcpu.cfg b/ingredients/base-hypervisor-amdcpu.cfg index 2958651..92546bb 100644 --- a/ingredients/base-hypervisor-amdcpu.cfg +++ b/ingredients/base-hypervisor-amdcpu.cfg @@ -1,13 +1,4 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? This kickstart file preloads the vfio-pci driver for devices that are binded to it, activates IOMMU and enables nested-virtualization for AMD (tm) CPUs - -%post --nochroot --log=/mnt/sysimage/opt/base-hypervisor-amdcpu.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting +%post --nochroot --log=/mnt/sysimage/root/base-hypervisor-amdcpu.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting sed -i 's/\(quiet\)/\1 iommu=pt rd.driver.pre=vfio-pci/i' /mnt/sysimage/etc/default/grub # Load kernel modules in GRUB. diff --git a/ingredients/base-hypervisor-intelcpu.cfg b/ingredients/base-hypervisor-intelcpu.cfg index c6ba085..36e83d1 100644 --- a/ingredients/base-hypervisor-intelcpu.cfg +++ b/ingredients/base-hypervisor-intelcpu.cfg @@ -1,13 +1,4 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? This kickstart file preloads the vfio-pci driver for devices that are binded to it, activates IOMMU and enables nested-virtualization for Intel(tm) CPUs - -%post --nochroot --log=/mnt/sysimage/opt/base-hypervisor-intelcpu.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting +%post --nochroot --log=/mnt/sysimage/root/base-hypervisor-intelcpu.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting sed -i 's/\(quiet\)/\1 intel_iommu=on iommu=pt rd.driver.pre=vfio-pci/i' /mnt/sysimage/etc/default/grub # Load kernel modules in GRUB. diff --git a/ingredients/base-hypervisor-intelgpu.cfg b/ingredients/base-hypervisor-intelgpu.cfg index 9190455..99c6fef 100644 --- a/ingredients/base-hypervisor-intelgpu.cfg +++ b/ingredients/base-hypervisor-intelgpu.cfg @@ -1,14 +1,4 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? This kickstart file enables vfio-mdev and KVMGT for compatible Intel(tm) graphic cards, allowing a host to create virtual GPUs. -# The fifth generation of Broadwell-based SoC are compatible, up to the ninth generation (Cannon Lake and Whiskey Lake). Tiger Lake and later SoC based on the new Xe GPU architecture are not compatible, as they use SR/IOV instead. - -%post --nochroot --log=/mnt/sysimage/opt/base-hypervisor-intelgpu.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installtion troubleshooting +%post --nochroot --log=/mnt/sysimage/root/base-hypervisor-intelgpu.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installtion troubleshooting sed -i 's/\(vfio-pci\)/\1 i915.enable_gvt=1/i' /mnt/sysimage/etc/default/grub # Load kernel modules in grub. diff --git a/ingredients/base-hypervisor.cfg b/ingredients/base-hypervisor.cfg index c18d144..18fb626 100644 --- a/ingredients/base-hypervisor.cfg +++ b/ingredients/base-hypervisor.cfg @@ -1,12 +1,3 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? This kickstart file provides a basic, generic building block to build a virtualization host. - 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. @@ -24,7 +15,7 @@ guestfs-tools # Complementary tools useful for interacting with vith guest syste %end # End of the packages section -%post --nochroot --log=/mnt/sysimage/opt/base-hypervisor.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting +%post --nochroot --log=/mnt/sysimage/root/base-hypervisor.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting # Load kernel modules by adding vfio, vfio_pci, vfio_iommu_type1, vfio_virqfd echo "vfio" > /mnt/sysimage/etc/modules-load.d/vfio.conf diff --git a/ingredients/core-packages-default.cfg b/ingredients/core-packages-default.cfg index 2ba2251..f75c18b 100644 --- a/ingredients/core-packages-default.cfg +++ b/ingredients/core-packages-default.cfg @@ -1,12 +1,3 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ -# -# Provides the default but not necessary packages that are part of the core DNF group - %packages --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies. Description courtesy of the Fedora project # Default but not necessary packages that are part of the core DNF group diff --git a/ingredients/core-post-nochroot.cfg b/ingredients/core-post-nochroot.cfg index 4a7c24a..13d1838 100644 --- a/ingredients/core-post-nochroot.cfg +++ b/ingredients/core-post-nochroot.cfg @@ -1,13 +1,3 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ -# -# What ? This kickstart file contains scripts made to be launched right after the system has been installed but before the first boot -# More information: https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html#chapter-6-post-installation-script - %post --nochroot --log=/mnt/sysimage/root/post-nochroot.log # Beginning of the post-installation section. Log all messages to a given file %end # End of the %post section \ No newline at end of file diff --git a/ingredients/core-post.cfg b/ingredients/core-post.cfg index 0d42474..e60d4d6 100644 --- a/ingredients/core-post.cfg +++ b/ingredients/core-post.cfg @@ -1,13 +1,3 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ -# -# What ? This kickstart file contains scripts made to be launched right after the system has been installed but before the first boot -# More information: https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html#chapter-6-post-installation-script - %post --log=/mnt/sysimage/root/post.log # Beginning of the post-installation section. Log all messages to a given file localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked. diff --git a/ingredients/core-pre-install.cfg b/ingredients/core-pre-install.cfg index b611ea8..1fa55ae 100644 --- a/ingredients/core-pre-install.cfg +++ b/ingredients/core-pre-install.cfg @@ -1,13 +1,3 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ -# -# Script triggered just after the system storage has been set up -# More information: https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html#chapter-5-pre-install-script - %pre --log=/mnt/sysimage/root/pre-install.log Beginning of the pre-installation section. Log all messages to a given file %end # End of the %post section \ No newline at end of file diff --git a/ingredients/core-pre.cfg b/ingredients/core-pre.cfg index 490e640..38f43d2 100644 --- a/ingredients/core-pre.cfg +++ b/ingredients/core-pre.cfg @@ -1,13 +1,3 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ -# -# Script triggered just after the kickstart file has been parsed -# More information: https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html#chapter-4-pre-installation-script - %pre --log=/mnt/sysimage/root/pre.log Beginning of the pre section. Log all messages to a given file %end # End of the %post section \ No newline at end of file diff --git a/ingredients/live-core-bootloader-grub.cfg b/ingredients/live-core-bootloader-grub.cfg index fc6bfb6..b936579 100644 --- a/ingredients/live-core-bootloader-grub.cfg +++ b/ingredients/live-core-bootloader-grub.cfg @@ -1,10 +1 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? This kickstart ingredient provides GNU GRUB for live systems - bootloader --location=none --timeout=1 # Set the GNU GRUB bootloader timeout to 1 and to location to none \ No newline at end of file diff --git a/ingredients/live-core-mandatory-packages.cfg b/ingredients/live-core-mandatory-packages.cfg index 0886b1b..6e19b2c 100644 --- a/ingredients/live-core-mandatory-packages.cfg +++ b/ingredients/live-core-mandatory-packages.cfg @@ -1,12 +1,3 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? This kickstart file provides a basic block to build a minimal, live system - %packages # Beginning of the package section. Include weak dependencies. Description courtesy of the Fedora project @anaconda-tools diff --git a/ingredients/live-core-post-live-session.cfg b/ingredients/live-core-post-live-session.cfg index 5a644c9..53c7811 100644 --- a/ingredients/live-core-post-live-session.cfg +++ b/ingredients/live-core-post-live-session.cfg @@ -1,12 +1,3 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? This kickstart ingredients allows for scripts to be executed after the installations - %post --log=/mnt/sysimage/root/post-live-session.log # Beginning of the post-installation section. Add logging. # set livesys session type diff --git a/ingredients/live-core-post.cfg b/ingredients/live-core-post.cfg index 65d46c7..6254c73 100644 --- a/ingredients/live-core-post.cfg +++ b/ingredients/live-core-post.cfg @@ -1,13 +1,4 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? This kickstart ingredients allows for scripts to be executed after the installation - -%post --log=/mnt/sysimage/root/post.log # Beginning of the post-installation section. Add logging. +%post --log=/mnt/sysimage/root/post-live-core.log # Beginning of the post-installation section. Add logging. # Enable livesys services systemctl enable livesys.service diff --git a/ingredients/live-core-storage.cfg b/ingredients/live-core-storage.cfg index 96fe392..a223d0b 100644 --- a/ingredients/live-core-storage.cfg +++ b/ingredients/live-core-storage.cfg @@ -1,15 +1,5 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? This kickstart file provides a basic partition layout for live systems, without encryption. - zerombr # WARNING : Dangerous command ! Will clear the Master Boot Record clearpart --all --initlabel # Partition clearing information. This setup uses GPT by default. -bootloader --timeout=1 # Set the GNU GRUB bootloader timeout to 1 part / --fstype="ext4" --size=5120 # Create a root partition of around 7GB -part / --size=8576 +part / --size=8576 \ No newline at end of file diff --git a/ingredients/live-core.cfg b/ingredients/live-core.cfg index fe29e67..3ad8a71 100644 --- a/ingredients/live-core.cfg +++ b/ingredients/live-core.cfg @@ -1,12 +1 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ -# -# What ? This kickstart ingredient defines the installation method for live systems - -#text # Undefine an installation mode - poweroff # Shut down the system after a successful installation \ No newline at end of file