From 02d4ef974a7cdf011e644bf3d9ea215aaabc9518 Mon Sep 17 00:00:00 2001
From: nazunalika <tucklesepk@gmail.com>
Date: Sun, 15 May 2022 10:34:12 -0700
Subject: [PATCH] remove extraneous posts

---
 Rocky-8-KDE.ks              | 48 +++++++++++++++++--------------------
 Rocky-8-Workstation-Lite.ks | 48 +++++++++++++++++--------------------
 Rocky-8-Workstation.ks      | 48 +++++++++++++++++--------------------
 Rocky-8-XFCE.ks             | 48 ++++++++++++++++++-------------------
 4 files changed, 89 insertions(+), 103 deletions(-)

diff --git a/Rocky-8-KDE.ks b/Rocky-8-KDE.ks
index 9e85a92..926f223 100644
--- a/Rocky-8-KDE.ks
+++ b/Rocky-8-KDE.ks
@@ -311,32 +311,6 @@ rm -f /boot/*-rescue*
 rm -f /etc/machine-id
 touch /etc/machine-id
 
-%end
-
-%post --nochroot
-cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
-
-# only works on x86_64
-if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
-    # For livecd-creator builds
-    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
-    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
-
-    # For lorax/livemedia-creator builds
-    sed -i '
-    /## make boot.iso/ i\
-    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
-    <% f = "usr/bin/livecd-iso-to-disk" %>\
-    %if exists(f):\
-        install ${f} ${LIVEDIR}/${f|basename}\
-    %endif\
-    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
-fi
-
-%end
-
-%post
-
 # set default GTK+ theme for root (see #683855, #689070, #808062)
 cat > /root/.gtkrc-2.0 << EOF
 include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
@@ -446,6 +420,28 @@ dnf config-manager --set-enabled powertools
 
 %end
 
+%post --nochroot
+cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
+
+# only works on x86_64
+if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
+    # For livecd-creator builds
+    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+
+    # For lorax/livemedia-creator builds
+    sed -i '
+    /## make boot.iso/ i\
+    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
+    <% f = "usr/bin/livecd-iso-to-disk" %>\
+    %if exists(f):\
+        install ${f} ${LIVEDIR}/${f|basename}\
+    %endif\
+    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
+fi
+
+%end
+
 %packages
 @^kde-desktop-environment
 @anaconda-tools
diff --git a/Rocky-8-Workstation-Lite.ks b/Rocky-8-Workstation-Lite.ks
index 91bb3f7..1275916 100644
--- a/Rocky-8-Workstation-Lite.ks
+++ b/Rocky-8-Workstation-Lite.ks
@@ -309,32 +309,6 @@ rm -f /boot/*-rescue*
 rm -f /etc/machine-id
 touch /etc/machine-id
 
-%end
-
-%post --nochroot
-cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
-
-# This only works on x86_64
-if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
-    # For livecd-creator builds
-    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
-    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
-
-    # For lorax/livemedia-creator builds
-    sed -i '
-    /## make boot.iso/ i\
-    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
-    <% f = "usr/bin/livecd-iso-to-disk" %>\
-    %if exists(f):\
-        install ${f} ${LIVEDIR}/${f|basename}\
-    %endif\
-    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
-fi
-
-%end
-
-%post
-
 cat >> /etc/rc.d/init.d/livesys << EOF
 
 
@@ -422,6 +396,28 @@ EOF
 
 %end
 
+%post --nochroot
+cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
+
+# This only works on x86_64
+if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
+    # For livecd-creator builds
+    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+
+    # For lorax/livemedia-creator builds
+    sed -i '
+    /## make boot.iso/ i\
+    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
+    <% f = "usr/bin/livecd-iso-to-disk" %>\
+    %if exists(f):\
+        install ${f} ${LIVEDIR}/${f|basename}\
+    %endif\
+    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
+fi
+
+%end
+
 %packages
 @anaconda-tools
 @base-x
diff --git a/Rocky-8-Workstation.ks b/Rocky-8-Workstation.ks
index 579bfa6..d007f33 100644
--- a/Rocky-8-Workstation.ks
+++ b/Rocky-8-Workstation.ks
@@ -309,32 +309,6 @@ rm -f /boot/*-rescue*
 rm -f /etc/machine-id
 touch /etc/machine-id
 
-%end
-
-%post --nochroot
-cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
-
-# This only works on x86_64
-if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
-    # For livecd-creator builds
-    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
-    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
-
-    # For lorax/livemedia-creator builds
-    sed -i '
-    /## make boot.iso/ i\
-    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
-    <% f = "usr/bin/livecd-iso-to-disk" %>\
-    %if exists(f):\
-        install ${f} ${LIVEDIR}/${f|basename}\
-    %endif\
-    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
-fi
-
-%end
-
-%post
-
 cat >> /etc/rc.d/init.d/livesys << EOF
 
 
@@ -422,6 +396,28 @@ EOF
 
 %end
 
+%post --nochroot
+cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
+
+# This only works on x86_64
+if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
+    # For livecd-creator builds
+    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+
+    # For lorax/livemedia-creator builds
+    sed -i '
+    /## make boot.iso/ i\
+    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
+    <% f = "usr/bin/livecd-iso-to-disk" %>\
+    %if exists(f):\
+        install ${f} ${LIVEDIR}/${f|basename}\
+    %endif\
+    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
+fi
+
+%end
+
 %packages
 @anaconda-tools
 @base-x
diff --git a/Rocky-8-XFCE.ks b/Rocky-8-XFCE.ks
index 3d471d7..f64dc5a 100644
--- a/Rocky-8-XFCE.ks
+++ b/Rocky-8-XFCE.ks
@@ -311,31 +311,6 @@ rm -f /boot/*-rescue*
 rm -f /etc/machine-id
 touch /etc/machine-id
 
-%end
-
-%post --nochroot
-cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
-
-# only works on x86_64
-if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
-    # For livecd-creator builds
-    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
-    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
-
-    # For lorax/livemedia-creator builds
-    sed -i '
-    /## make boot.iso/ i\
-    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
-    <% f = "usr/bin/livecd-iso-to-disk" %>\
-    %if exists(f):\
-        install ${f} ${LIVEDIR}/${f|basename}\
-    %endif\
-    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
-fi
-
-%end
-
-%post
 # xfce configuration
 
 # create /etc/sysconfig/desktop (needed for installation)
@@ -434,6 +409,28 @@ dnf config-manager --set-enabled powertools
 
 %end
 
+%post --nochroot
+cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
+
+# only works on x86_64
+if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
+    # For livecd-creator builds
+    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+
+    # For lorax/livemedia-creator builds
+    sed -i '
+    /## make boot.iso/ i\
+    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
+    <% f = "usr/bin/livecd-iso-to-disk" %>\
+    %if exists(f):\
+        install ${f} ${LIVEDIR}/${f|basename}\
+    %endif\
+    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
+fi
+
+%end
+
 %packages
 @anaconda-tools
 @base-x
@@ -516,3 +513,4 @@ xdg-user-dirs-gtk
 -xsane-gimp
 
 %end
+