From 4641a2ccff8273daeddb577bface4a9d6dfb4ad6 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Tue, 17 Oct 2023 10:35:30 +0200
Subject: [PATCH] Adding additional output to templates/el9-standard.ks

---
 etc/cobbler-distros.d/centos-stream-8.yaml |  1 +
 etc/cobbler-distros.d/rhel-9.yaml          |  1 +
 templates/el9-standard.ks                  | 66 +++++++++++++++++++++-
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/etc/cobbler-distros.d/centos-stream-8.yaml b/etc/cobbler-distros.d/centos-stream-8.yaml
index c1ea73a..8ec725b 100644
--- a/etc/cobbler-distros.d/centos-stream-8.yaml
+++ b/etc/cobbler-distros.d/centos-stream-8.yaml
@@ -30,6 +30,7 @@ cobbler-distros:
       - 'curl'
       - 'dbus'
       - 'git'
+      - 'grubby'
       - 'iotop'
       - 'langpacks-de'
       - 'lsof'
diff --git a/etc/cobbler-distros.d/rhel-9.yaml b/etc/cobbler-distros.d/rhel-9.yaml
index c51b4a8..2f352cd 100644
--- a/etc/cobbler-distros.d/rhel-9.yaml
+++ b/etc/cobbler-distros.d/rhel-9.yaml
@@ -18,6 +18,7 @@ cobbler-distros:
       - 'chrony'
       - 'curl'
       - 'dbus'
+      - 'grubby'
       - 'iotop'
       - 'kexec-tools'
       - 'langpacks-de'
diff --git a/templates/el9-standard.ks b/templates/el9-standard.ks
index c462933..9154f63 100644
--- a/templates/el9-standard.ks
+++ b/templates/el9-standard.ks
@@ -78,8 +78,14 @@ logvol  /var/log  --vgname=vgroot --name=log  --fstype=xfs  --size=3072
 # Pre tasks
 %pre --interpreter=/bin/bash --log=/var/log/ks-pre.log
 #raw
+echo
+echo "###########################################################"
+echo
+
 echo "[$( date --rfc-3339=seconds )]: Let's launch the missle ..."
 echo
+echo "------------"
+echo "Checking nameservers ..."
 if grep '^nameserver' /etc/resolv.conf >/dev/null ; then
     echo "Nameservers are defined in /etc/resolv.conf:"
     grep '^nameserver' /etc/resolv.conf
@@ -89,11 +95,31 @@ else
     echo "nameserver 93.188.104.82" >>/etc/resolv.conf
     echo "nameserver 217.66.52.10" >>/etc/resolv.conf
 fi
-
 echo
 echo "Used /etc/resolv.conf:"
 cat /etc/resolv.conf
 
+echo
+echo "------------"
+echo "Blockdevices:"
+lsblk
+
+echo
+echo "------------"
+echo "Current Linux-Kernel:"
+uname -a
+
+echo
+echo "------------"
+echo "Current Kernel packages:"
+rpm -qa | grep -i kernel | sort -i
+
+echo
+echo "------------"
+echo "Mkfs.xfs"
+mkfs.xfs -V
+
+
 #end raw
 %end
 
@@ -101,7 +127,11 @@ cat /etc/resolv.conf
 # Pre installation tasks
 %pre-install --interpreter=/bin/bash --log=/var/log/ks-pre-install.log
 #raw
+echo
+echo "###########################################################"
+echo
 echo "[$( date --rfc-3339=seconds )]: Pre installation tasks ..."
+
 #end raw
 %end
 
@@ -124,31 +154,44 @@ exec < /dev/console &> >(tee -a "$POST_LOG")
 ### debug
 # set -x
 
+echo
+echo "###########################################################"
+echo
+echo "[$( date --rfc-3339=seconds )]: Post installation tasks in chroot ..."
+
+echo
+echo "------------"
 echo "cobbler profile = $profile_name"
 
 echo
+echo "------------"
 echo "IP interfaces"
 ip link show
 
 echo
+echo "------------"
 echo "IP addresses"
 ip address show
 
 echo
+echo "------------"
 echo "IPv4 routes"
 ip route list
 
 echo
+echo "------------"
 echo "IPv6 routes"
 ip -6 route list
 
 echo
+echo "------------"
 echo "/etc/resolv.conf"
 cat /etc/resolv.conf
 
 if [[ -d "/etc/yum.repos.d" ]] ; then
 
     echo
+    echo "------------"
     echo "/etc/yum.repos.d/"
     ls -lA /etc/yum.repos.d
 
@@ -164,6 +207,27 @@ if [[ -d "/etc/yum.repos.d" ]] ; then
 
 fi
 
+echo
+echo "------------"
+echo "Current Kernel packages:"
+rpm -qa | grep -i kernel | sort -i
+
+echo
+echo "------------"
+echo "Mkfs.xfs"
+mkfs.xfs -V
+
+echo
+echo "------------"
+echo "Grub installed kernels:"
+grubby --info=ALL
+
+echo
+echo "------------"
+echo "Grub default kernel:"
+grubby --default-index
+grubby --default-title
+grubby --default-kernel
 
 ### remove unnecessary directory
 rm -rf /var/var
-- 
2.39.5