From 01e06d7df8e150a922fae50f9d343f31459a0309 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Wed, 18 Oct 2023 10:13:04 +0200
Subject: [PATCH] Showing all anaconda logs.

---
 lib/cr_vmware_tpl/handler/__init__.py |  2 +-
 lib/cr_vmware_tpl/handler/vm.py       | 52 ++++++++++++++++-----------
 templates/el9-standard.ks             | 41 ++++++++++-----------
 3 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/lib/cr_vmware_tpl/handler/__init__.py b/lib/cr_vmware_tpl/handler/__init__.py
index 71133e8..f2b8c1c 100644
--- a/lib/cr_vmware_tpl/handler/__init__.py
+++ b/lib/cr_vmware_tpl/handler/__init__.py
@@ -47,7 +47,7 @@ from ..cobbler import Cobbler
 
 from ..xlate import XLATOR
 
-__version__ = '2.4.8'
+__version__ = '2.4.9'
 
 LOG = logging.getLogger(__name__)
 TZ = pytz.timezone('Europe/Berlin')
diff --git a/lib/cr_vmware_tpl/handler/vm.py b/lib/cr_vmware_tpl/handler/vm.py
index 28b5057..4e0183d 100644
--- a/lib/cr_vmware_tpl/handler/vm.py
+++ b/lib/cr_vmware_tpl/handler/vm.py
@@ -219,31 +219,41 @@ class HandlerVmMixin():
     # -------------------------------------------------------------------------
     def show_install_log(self):
 
-        LOG.info(_("Showing post install log ..."))
-        install_logfile = '/var/log/anaconda/post-install.log'
-
-        cmd = textwrap.dedent("""\
-        if [ -f {log} ] ; then
-            echo "-----------------------------------------------------------"
-            cat {log}
-            echo "-----------------------------------------------------------"
-            echo
-        else
-            echo "Post install log {log} not found!" >&2
-        fi
+        logfiles = ['ks-pre.log', 'ks-pre-install.log', 'post-install.log']
+        lf_desc = {
+            'ks-pre.log': 'Pre all log',
+            'ks-pre-install.log': 'Pre install log',
+            'post-install.log': 'Post install log',
+        }
+
+        for logfile in logfiles:
+            lf = '/var/log/anaconda/' + logfile
+            desc = lf_desc[logfile]
+
+            LOG.info(_("Showing {desc} {lf!r} ...".format(desc=desc, lf=lf)))
+
+            cmd = textwrap.dedent("""\
+            if [ -f {log} ] ; then
+                echo "-----------------------------------------------------------"
+                cat {log}
+                echo "-----------------------------------------------------------"
+                echo
+            else
+                echo "Post install log {log} not found!" >&2
+            fi
 
-        """).format(log=install_logfile)
+            """).format(log=lf)
 
-        result = self.exec_remote(cmd)
+            result = self.exec_remote(cmd)
 
-        if result['err']:
-            LOG.error(result['err'])
-            if self.postinstall_errors:
-                self.postinstall_errors += result['err']
+            if result['err']:
+                LOG.error(result['err'])
+                if self.postinstall_errors:
+                    self.postinstall_errors += result['err']
+                else:
+                    self.postinstall_errors = result['err']
             else:
-                self.postinstall_errors = result['err']
-        else:
-            LOG.debug("Post install log:\n\n" + result['out'])
+                LOG.debug("{}:\n\n".format(desc) + result['out'])
 
     # -------------------------------------------------------------------------
     def get_postinstall_error(self):
diff --git a/templates/el9-standard.ks b/templates/el9-standard.ks
index 3a06e37..6026b6b 100644
--- a/templates/el9-standard.ks
+++ b/templates/el9-standard.ks
@@ -34,9 +34,6 @@ selinux --permissiv
 # Do not configure the X Window System
 skipx
 
-# Installation logging level
-logging --level=debug
-
 # Reboot after installation
 reboot
 
@@ -120,6 +117,22 @@ ls -lA /dev/disk/*/
 %pre-install --interpreter=/bin/bash --log=/var/log/ks-pre-install.log
 #raw
 echo "[$( date --rfc-3339=seconds )]: Pre installation tasks ..."
+
+echo
+echo "LVM:"
+
+echo
+echo "pvs"
+pvs --units m
+
+echo
+echo "vgs"
+vgs --units m
+
+echo
+echo "lvs"
+lvs --units m
+
 #end raw
 %end
 
@@ -187,6 +200,7 @@ if [[ -d "/etc/yum.repos.d" ]] ; then
 
 fi
 
+#raw
 echo
 echo "Linux kernel versions:"
 rpm -qa | grep -i kernel | sort -i
@@ -196,21 +210,8 @@ echo "Default kernel in GRUB:"
 grubby --default-index
 grubby --default-title
 grubby --default-kernel
+#end raw
 
-echo
-echo "LVM:"
-
-echo
-echo "pvs"
-pvs --units m
-
-echo
-echo "vgs"
-vgs --units m
-
-echo
-echo "lvs"
-lvs --units m
 
 ### remove unnecessary directory
 rm -rf /var/var
@@ -269,8 +270,8 @@ echo
 echo "Mangling /etc/lvm/lvm.conf ..."
 sed -i -e 's/^\(.*\)# use_devicesfile.*/\1use_devicesfile = 0/' /etc/lvm/lvm.conf
 echo
-grep devicesfile /etc/lvm/lvm.conf
-# end raw
+grep -C 2 devicesfile /etc/lvm/lvm.conf
+#end raw
 
 ###############################################################################
 # Performing snippets
@@ -307,4 +308,4 @@ done
 #end raw
 %end
 
-# Last line
+# vim: filetype=kickstart
-- 
2.39.5