From 71ce570ebb47237e912480b1d5a7484a9e4069a1 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 29 Jun 2020 15:55:11 +0200
Subject: [PATCH] Adding and using snippets/tpl.280.dist-upgrade.sh; version
 bump to 2.0.3

---
 kickstart/template-oel7.ks       |  5 +++++
 lib/cr_vmware_tpl/__init__.py    |  2 +-
 snippets/tpl.270.remove-uek.sh   | 17 ++++++++++++++---
 snippets/tpl.280.dist-upgrade.sh | 26 ++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 snippets/tpl.280.dist-upgrade.sh

diff --git a/kickstart/template-oel7.ks b/kickstart/template-oel7.ks
index f8e754d..b6444fe 100644
--- a/kickstart/template-oel7.ks
+++ b/kickstart/template-oel7.ks
@@ -231,6 +231,11 @@ echo
 echo "Using snippet $remove_uek_snippet"
 $SNIPPET($remove_uek_snippet)
 
+#set $dist_upgrade_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.280.dist-upgrade.sh"
+echo
+echo "Using snippet $dist_upgrade_snippet"
+$SNIPPET($dist_upgrade_snippet)
+
 #set $create_motd_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.300.create-motd.sh"
 echo
 echo "Using snippet $create_motd_snippet"
diff --git a/lib/cr_vmware_tpl/__init__.py b/lib/cr_vmware_tpl/__init__.py
index 6273bfb..d8196e7 100644
--- a/lib/cr_vmware_tpl/__init__.py
+++ b/lib/cr_vmware_tpl/__init__.py
@@ -1,6 +1,6 @@
 #!/bin/env python3
 # -*- coding: utf-8 -*-
 
-__version__ = '2.0.2'
+__version__ = '2.0.3'
 
 # vim: ts=4 et list
diff --git a/snippets/tpl.270.remove-uek.sh b/snippets/tpl.270.remove-uek.sh
index b3e8d86..3d3de66 100644
--- a/snippets/tpl.270.remove-uek.sh
+++ b/snippets/tpl.270.remove-uek.sh
@@ -12,10 +12,21 @@ remove_uek_packages() {
 
     sed -i -e 's/^\(DEFAULTKERNEL=\).*/\1kernel/i' /etc/sysconfig/kernel
 
-    echo
-    log "Removing UEK packages ..."
+    if rpm -qa | grep -- -uek- >/dev/null ; then
+
+        echo
+        log "Removing UEK packages ..."
+
+        if yum remove -y *-uek-*; then
+            :
+        else
+            echo "[$(date)]: Could not remove UEK packages." | tee -a "${ERROR_POINTER}"
+        fi
 
-    yum remove -y *-uek-*
+    else
+        echo
+        echo "Removing UEK packages not necessary."
+    fi
 
 }
 
diff --git a/snippets/tpl.280.dist-upgrade.sh b/snippets/tpl.280.dist-upgrade.sh
new file mode 100644
index 0000000..ddc4ea2
--- /dev/null
+++ b/snippets/tpl.280.dist-upgrade.sh
@@ -0,0 +1,26 @@
+## !/bin/bash
+#raw
+
+#-----------------------------------------------------------
+dist_upgrade() {
+
+    echo
+    echo "${HASH_LINE}"
+    echo "Calling dist_upgrade() ..."
+    echo
+    log "Upgrading all packages ..."
+    echo
+
+    if yum upgrade -y ; then
+        :
+    else
+        echo "[$(date)]: Upgrading system not successful." | tee -a "${ERROR_POINTER}"
+    fi
+
+}
+
+dist_upgrade
+
+#end raw
+## vim: ts=4 et list
+
-- 
2.39.5