From 805e31db25d1e4b6c1eb57c946a4238e90ece13a Mon Sep 17 00:00:00 2001 From: luz Date: Wed, 30 Apr 2025 16:48:15 -0500 Subject: [PATCH] add logs, reconfig system --- dishes/desktop-hypervisor-amdcpu.cfg | 4 +++- dishes/desktop-hypervisor-intelcpu-intelgpu.cfg | 4 +++- dishes/desktop-hypervisor-intelcpu.cfg | 4 +++- dishes/desktop-hypervisor.cfg | 4 +++- dishes/live-desktop-hypervisor.cfg | 4 +++- dishes/virtual-desktop-hypervisor.cfg | 4 +++- dishes/virtual-desktop.cfg | 4 +++- dishes/virtual-nano.cfg | 2 +- dishes/virtual-server.cfg | 2 +- ingredients/core-desktop-initial-setup.cfg | 2 ++ ingredients/core-packages-mandatory.cfg | 3 ++- ingredients/core-post-nochroot.cfg | 13 +++++++++++++ ingredients/core-post.cfg | 3 ++- ingredients/core-pre-install.cfg | 13 +++++++++++++ ingredients/core-pre.cfg | 13 +++++++++++++ ingredients/core-server-initial-setup.cfg | 4 ++-- ingredients/live-core-post.cfg | 2 +- 17 files changed, 71 insertions(+), 14 deletions(-) create mode 100644 ingredients/core-post-nochroot.cfg create mode 100644 ingredients/core-pre-install.cfg create mode 100644 ingredients/core-pre.cfg diff --git a/dishes/desktop-hypervisor-amdcpu.cfg b/dishes/desktop-hypervisor-amdcpu.cfg index 6a855c1..cc9022c 100644 --- a/dishes/desktop-hypervisor-amdcpu.cfg +++ b/dishes/desktop-hypervisor-amdcpu.cfg @@ -4,6 +4,8 @@ text # Firewall configuration firewall --disabled +# Run the Setup Agent on first boot +firstboot --reconfig # Keyboard layouts keyboard --xlayouts='ch (fr)' # System language @@ -37,7 +39,7 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt part /boot --fstype="ext4" --size=512 --label=boot part / --fstype="ext4" --grow --label=root -%post --logfile=/opt/base-post.log +%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 diff --git a/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg b/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg index 5f698e5..9d2941a 100644 --- a/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg +++ b/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg @@ -4,6 +4,8 @@ text # Firewall configuration firewall --disabled +# Run the Setup Agent on first boot +firstboot --reconfig # Keyboard layouts keyboard --xlayouts='ch (fr)' # System language @@ -37,7 +39,7 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt part /boot --fstype="ext4" --size=512 --label=boot part / --fstype="ext4" --grow --label=root -%post --logfile=/opt/base-post.log +%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 diff --git a/dishes/desktop-hypervisor-intelcpu.cfg b/dishes/desktop-hypervisor-intelcpu.cfg index 0b08838..c3c6686 100644 --- a/dishes/desktop-hypervisor-intelcpu.cfg +++ b/dishes/desktop-hypervisor-intelcpu.cfg @@ -4,6 +4,8 @@ text # Firewall configuration firewall --disabled +# Run the Setup Agent on first boot +firstboot --reconfig # Keyboard layouts keyboard --xlayouts='ch (fr)' # System language @@ -37,7 +39,7 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt part /boot --fstype="ext4" --size=512 --label=boot part / --fstype="ext4" --grow --label=root -%post --logfile=/opt/base-post.log +%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 diff --git a/dishes/desktop-hypervisor.cfg b/dishes/desktop-hypervisor.cfg index 3f19a69..426b2e2 100644 --- a/dishes/desktop-hypervisor.cfg +++ b/dishes/desktop-hypervisor.cfg @@ -4,6 +4,8 @@ text # Firewall configuration firewall --disabled +# Run the Setup Agent on first boot +firstboot --reconfig # Keyboard layouts keyboard --xlayouts='ch (fr)' # System language @@ -37,7 +39,7 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt part /boot --fstype="ext4" --size=512 --label=boot part / --fstype="ext4" --grow --label=root -%post --logfile=/opt/base-post.log +%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 diff --git a/dishes/live-desktop-hypervisor.cfg b/dishes/live-desktop-hypervisor.cfg index eaeaad8..f73f4fd 100644 --- a/dishes/live-desktop-hypervisor.cfg +++ b/dishes/live-desktop-hypervisor.cfg @@ -2,6 +2,8 @@ #version=DEVEL # Firewall configuration firewall --disabled +# Run the Setup Agent on first boot +firstboot --reconfig # Keyboard layouts keyboard --xlayouts='ch (fr)' # System language @@ -33,7 +35,7 @@ clearpart --all --initlabel # Disk partitioning information part / --fstype="ext4" --size=5120 -%post +%post --logfile=/mnt/sysimage/root/post.log # Enable livesys services systemctl enable livesys.service diff --git a/dishes/virtual-desktop-hypervisor.cfg b/dishes/virtual-desktop-hypervisor.cfg index fba511a..8091088 100644 --- a/dishes/virtual-desktop-hypervisor.cfg +++ b/dishes/virtual-desktop-hypervisor.cfg @@ -4,6 +4,8 @@ text # Firewall configuration firewall --disabled +# Run the Setup Agent on first boot +firstboot --reconfig # Keyboard layouts keyboard --xlayouts='ch (fr)' # System language @@ -37,7 +39,7 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt part /boot --fstype="ext4" --size=512 --label=boot part / --fstype="ext4" --grow --label=root -%post --logfile=/opt/base-post.log +%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 diff --git a/dishes/virtual-desktop.cfg b/dishes/virtual-desktop.cfg index f532569..1a2143f 100644 --- a/dishes/virtual-desktop.cfg +++ b/dishes/virtual-desktop.cfg @@ -4,6 +4,8 @@ text # Firewall configuration firewall --disabled +# Run the Setup Agent on first boot +firstboot --reconfig # Keyboard layouts keyboard --xlayouts='ch (fr)' # System language @@ -37,7 +39,7 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt part /boot --fstype="ext4" --size=512 --label=boot part / --fstype="ext4" --grow --label=root -%post --logfile=/opt/base-post.log +%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 diff --git a/dishes/virtual-nano.cfg b/dishes/virtual-nano.cfg index a38daef..0361880 100644 --- a/dishes/virtual-nano.cfg +++ b/dishes/virtual-nano.cfg @@ -37,7 +37,7 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt part /boot --fstype="ext4" --size=512 --label=boot part / --fstype="ext4" --grow --label=root -%post --logfile=/opt/base-post.log +%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 diff --git a/dishes/virtual-server.cfg b/dishes/virtual-server.cfg index a3c6761..07c2525 100644 --- a/dishes/virtual-server.cfg +++ b/dishes/virtual-server.cfg @@ -37,7 +37,7 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt part /boot --fstype="ext4" --size=512 --label=boot part / --fstype="ext4" --grow --label=root -%post --logfile=/opt/base-post.log +%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 diff --git a/ingredients/core-desktop-initial-setup.cfg b/ingredients/core-desktop-initial-setup.cfg index 24dbdd1..110f5f6 100644 --- a/ingredients/core-desktop-initial-setup.cfg +++ b/ingredients/core-desktop-initial-setup.cfg @@ -7,6 +7,8 @@ # What ? This kickstart file provides the basic plumbing for GNOME initial-setup to launch on the first system start-up. +firstboot --reconfig # Initial Setup will start after the first reboot + %packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies. gnome-initial-setup # Add GNOME initial setup too to let user create local account. diff --git a/ingredients/core-packages-mandatory.cfg b/ingredients/core-packages-mandatory.cfg index 674d86e..85b2a62 100644 --- a/ingredients/core-packages-mandatory.cfg +++ b/ingredients/core-packages-mandatory.cfg @@ -6,8 +6,9 @@ # /_/ /____/ # # What ? This kickstart file 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 --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies. Description courtesy of the Fedora project +%packages --ignoremissing --nocore --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies. Description courtesy of the Fedora project audit # User space tools for kernel auditing basesystem # The skeleton package which defines a simple Fedora system diff --git a/ingredients/core-post-nochroot.cfg b/ingredients/core-post-nochroot.cfg new file mode 100644 index 0000000..f0eb520 --- /dev/null +++ b/ingredients/core-post-nochroot.cfg @@ -0,0 +1,13 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ +# +# 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. Add logging. + +%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 fcb0b2c..691f115 100644 --- a/ingredients/core-post.cfg +++ b/ingredients/core-post.cfg @@ -6,8 +6,9 @@ # /_/ /____/ # # 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=/opt/base-post.log # Beginning of the post-installation section. Add logging. +%post --log=/mnt/sysimage/root/post.log # Beginning of the post-installation section. Add logging. localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked. dnf update -y # Update the system diff --git a/ingredients/core-pre-install.cfg b/ingredients/core-pre-install.cfg new file mode 100644 index 0000000..790d110 --- /dev/null +++ b/ingredients/core-pre-install.cfg @@ -0,0 +1,13 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ +# +# What ? This kickstart file contains scripts 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 + +%end # End of the %post section diff --git a/ingredients/core-pre.cfg b/ingredients/core-pre.cfg new file mode 100644 index 0000000..671dd0d --- /dev/null +++ b/ingredients/core-pre.cfg @@ -0,0 +1,13 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ +# +# What ? This kickstart file contains scripts 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 + +%end # End of the %post section diff --git a/ingredients/core-server-initial-setup.cfg b/ingredients/core-server-initial-setup.cfg index abd4d39..dc1c673 100644 --- a/ingredients/core-server-initial-setup.cfg +++ b/ingredients/core-server-initial-setup.cfg @@ -7,10 +7,10 @@ # What ? This kickstart file provides the basic plumbing for initial-setup to launch on the first system start-up. -firstboot --enable --reconfig # Initial Setup will start after the first reboot +firstboot --reconfig # Initial Setup will start after the first reboot %packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies. -initial-setup # Install the initial setup package. +initial-setup # Install the initial setup package %end # End of the packages section \ No newline at end of file diff --git a/ingredients/live-core-post.cfg b/ingredients/live-core-post.cfg index 33bb568..47e1d98 100644 --- a/ingredients/live-core-post.cfg +++ b/ingredients/live-core-post.cfg @@ -7,7 +7,7 @@ # What ? This kickstart ingredients allows for scripts to be executed after the installation -%post +%post --log=/mnt/sysimage/root/post.log # Beginning of the post-installation section. Add logging. # Enable livesys services systemctl enable livesys.service