From f6bfd46d041aa12cceb2668393df57db24e420bb Mon Sep 17 00:00:00 2001
From: StackKorora <42156355+StackKorora@users.noreply.github.com>
Date: Thu, 5 Jan 2023 18:05:21 -0600
Subject: [PATCH] Clean up 8.7 Beta, use text installation for kickstarts for
 lower memory and faster installation. (#13)

---
 desktop-8.7-Beta.ks         | 21 ---------------------
 desktop-8.ks                |  1 +
 desktop.ks                  |  1 +
 desktopencrypt-8-aarch64.ks |  1 +
 desktopencrypt-8.7-Beta.ks  | 17 -----------------
 desktopencrypt-8.ks         |  1 +
 desktopencrypt-aarch64.ks   |  1 +
 desktopencrypt.ks           |  1 +
 hdds.json                   |  6 ------
 minimal-8.7-Beta.ks         | 14 --------------
 minimal-8.ks                |  1 +
 minimal-uefi-8.7-Beta.ks    | 18 ------------------
 minimal-uefi-8.ks           |  1 +
 minimal-uefi.ks             |  1 +
 minimal.ks                  |  1 +
 server-8.7-Beta.ks          | 16 ----------------
 server-8.ks                 |  1 +
 server.ks                   |  1 +
 support-8.7-Beta.ks         | 19 -------------------
 support-8.ks                |  1 +
 support.ks                  |  1 +
 21 files changed, 14 insertions(+), 111 deletions(-)
 delete mode 100644 desktop-8.7-Beta.ks
 delete mode 100644 desktopencrypt-8.7-Beta.ks
 delete mode 100644 minimal-8.7-Beta.ks
 delete mode 100644 minimal-uefi-8.7-Beta.ks
 delete mode 100644 server-8.7-Beta.ks
 delete mode 100644 support-8.7-Beta.ks

diff --git a/desktop-8.7-Beta.ks b/desktop-8.7-Beta.ks
deleted file mode 100644
index 38be46e..0000000
--- a/desktop-8.7-Beta.ks
+++ /dev/null
@@ -1,21 +0,0 @@
-bootloader --location=mbr
-network --bootproto=dhcp
-url --url="https://download.rockylinux.org/stg/rocky/8.7-Beta/BaseOS/x86_64/os/"
-lang en_US.UTF-8
-keyboard us
-timezone --utc America/New_York
-clearpart --all
-autopart
-rootpw --plaintext weakpassword
-user --name=test --password=weakpassword --plaintext
-firstboot --enable
-poweroff
-
-%packages
-@^workstation-product-environment
--selinux-policy-minimum
-%end
-
-%post
-touch $INSTALL_ROOT/home/home_preserved
-%end
diff --git a/desktop-8.ks b/desktop-8.ks
index 7dac1b9..4c04e55 100644
--- a/desktop-8.ks
+++ b/desktop-8.ks
@@ -10,6 +10,7 @@ rootpw --plaintext weakpassword
 user --name=test --password=weakpassword --plaintext
 firstboot --enable
 poweroff
+text
 
 %packages
 @^workstation-product-environment
diff --git a/desktop.ks b/desktop.ks
index 016a0fd..e91b257 100644
--- a/desktop.ks
+++ b/desktop.ks
@@ -10,6 +10,7 @@ rootpw --plaintext weakpassword
 user --name=test --password=weakpassword --plaintext
 firstboot --enable
 poweroff
+text
 
 %packages
 @^workstation-product-environment
diff --git a/desktopencrypt-8-aarch64.ks b/desktopencrypt-8-aarch64.ks
index 7a4d71e..f6450bc 100644
--- a/desktopencrypt-8-aarch64.ks
+++ b/desktopencrypt-8-aarch64.ks
@@ -10,6 +10,7 @@ rootpw --plaintext weakpassword
 user --name=test --password=weakpassword --plaintext
 firstboot --enable
 poweroff
+text
 
 %packages
 @^workstation-product-environment
diff --git a/desktopencrypt-8.7-Beta.ks b/desktopencrypt-8.7-Beta.ks
deleted file mode 100644
index 56a364f..0000000
--- a/desktopencrypt-8.7-Beta.ks
+++ /dev/null
@@ -1,17 +0,0 @@
-bootloader --location=mbr
-network --bootproto=dhcp
-url --url="https://download.rockylinux.org/stg/rocky/8.7-Beta/BaseOS/x86_64/os/"
-lang en_US.UTF-8
-keyboard us
-timezone --utc America/New_York
-clearpart --all
-autopart --encrypted --passphrase=weakpassword
-rootpw --plaintext weakpassword
-user --name=test --password=weakpassword --plaintext
-firstboot --enable
-poweroff
-
-%packages
-@^workstation-product-environment
--selinux-policy-minimum
-%end
diff --git a/desktopencrypt-8.ks b/desktopencrypt-8.ks
index 3e54a89..695f9e5 100644
--- a/desktopencrypt-8.ks
+++ b/desktopencrypt-8.ks
@@ -10,6 +10,7 @@ rootpw --plaintext weakpassword
 user --name=test --password=weakpassword --plaintext
 firstboot --enable
 poweroff
+text
 
 %packages
 @^workstation-product-environment
diff --git a/desktopencrypt-aarch64.ks b/desktopencrypt-aarch64.ks
index 6dcae4e..1489c19 100644
--- a/desktopencrypt-aarch64.ks
+++ b/desktopencrypt-aarch64.ks
@@ -10,6 +10,7 @@ rootpw --plaintext weakpassword
 user --name=test --password=weakpassword --plaintext
 firstboot --enable
 poweroff
+text
 
 %packages
 @^workstation-product-environment
diff --git a/desktopencrypt.ks b/desktopencrypt.ks
index 47c68b3..a32d49a 100644
--- a/desktopencrypt.ks
+++ b/desktopencrypt.ks
@@ -10,6 +10,7 @@ rootpw --plaintext weakpassword
 user --name=test --password=weakpassword --plaintext
 firstboot --enable
 poweroff
+text
 
 %packages
 @^workstation-product-environment
diff --git a/hdds.json b/hdds.json
index 197df87..0c766cb 100644
--- a/hdds.json
+++ b/hdds.json
@@ -155,7 +155,6 @@
             "name" : "minimal",
             "releases" : {
                 "8" : ["x86_64", "aarch64"],
-                "8.7-Beta" : ["x86_64"],
                 "9" : ["x86_64", "aarch64"]
             },
             "size" : "15"
@@ -164,7 +163,6 @@
             "name" : "minimal-uefi",
             "releases" : {
                 "8" : ["x86_64", "aarch64"],
-                "8.7-Beta" : ["x86_64"],
                 "9" : ["x86_64", "aarch64"]
             },
             "size" : "15",
@@ -174,7 +172,6 @@
             "name" : "desktop",
             "releases" : {
                 "8": ["x86_64", "aarch64"],
-                "8.7-Beta" : ["x86_64"],
                 "9" : ["x86_64", "aarch64"]
             },
             "size" : "20"
@@ -183,7 +180,6 @@
             "name" : "desktopencrypt",
             "releases" : {
                 "8" : ["x86_64", "aarch64"],
-                "8.7-Beta" : ["x86_64"],
                 "9" : ["x86_64", "aarch64"]
             },
             "size" : "20"
@@ -192,7 +188,6 @@
             "name" : "server",
             "releases" : {
                 "8" : ["x86_64", "aarch64"],
-                "8.7-Beta" : ["x86_64"],
                 "9" : ["x86_64", "aarch64"]
             },
             "size" : "9"
@@ -201,7 +196,6 @@
             "name" : "support",
             "releases" : {
                 "8" : ["x86_64", "aarch64"],
-                "8.7-Beta" : ["x86_64"],
                 "9" : ["x86_64", "aarch64"]
             },
             "size" : "30"
diff --git a/minimal-8.7-Beta.ks b/minimal-8.7-Beta.ks
deleted file mode 100644
index 6392655..0000000
--- a/minimal-8.7-Beta.ks
+++ /dev/null
@@ -1,14 +0,0 @@
-bootloader --location=mbr
-network --bootproto=dhcp
-url --url="https://download.rockylinux.org/stg/rocky/8.7-Beta/BaseOS/x86_64/os/"
-lang en_US.UTF-8
-keyboard us
-timezone --utc America/New_York
-clearpart --all
-autopart
-rootpw weakpassword
-poweroff
-
-%packages
-@core
-%end
diff --git a/minimal-8.ks b/minimal-8.ks
index fe12163..d04d9d8 100644
--- a/minimal-8.ks
+++ b/minimal-8.ks
@@ -8,6 +8,7 @@ clearpart --all
 autopart
 rootpw weakpassword
 poweroff
+text
 
 %packages
 @core
diff --git a/minimal-uefi-8.7-Beta.ks b/minimal-uefi-8.7-Beta.ks
deleted file mode 100644
index 1687bcb..0000000
--- a/minimal-uefi-8.7-Beta.ks
+++ /dev/null
@@ -1,18 +0,0 @@
-bootloader --location=mbr
-network --bootproto=dhcp
-url --url="https://download.rockylinux.org/stg/rocky/8.7-Beta/BaseOS/x86_64/os/"
-lang en_US.UTF-8
-keyboard us
-timezone --utc America/New_York
-clearpart --all
-autopart
-rootpw weakpassword
-poweroff
-
-%packages
-@core
-%end
-
-%post
-touch $INSTALL_ROOT/home/home_preserved
-%end
diff --git a/minimal-uefi-8.ks b/minimal-uefi-8.ks
index d415c5d..29f50d6 100644
--- a/minimal-uefi-8.ks
+++ b/minimal-uefi-8.ks
@@ -8,6 +8,7 @@ clearpart --all
 autopart
 rootpw weakpassword
 poweroff
+text
 
 %packages
 @core
diff --git a/minimal-uefi.ks b/minimal-uefi.ks
index d0273e4..39cc942 100644
--- a/minimal-uefi.ks
+++ b/minimal-uefi.ks
@@ -8,6 +8,7 @@ clearpart --all
 autopart
 rootpw weakpassword
 poweroff
+text
 
 %packages
 @core
diff --git a/minimal.ks b/minimal.ks
index 19331b5..bfd56f4 100644
--- a/minimal.ks
+++ b/minimal.ks
@@ -8,6 +8,7 @@ clearpart --all
 autopart
 rootpw weakpassword
 poweroff
+text
 
 %packages
 @core
diff --git a/server-8.7-Beta.ks b/server-8.7-Beta.ks
deleted file mode 100644
index cd67a26..0000000
--- a/server-8.7-Beta.ks
+++ /dev/null
@@ -1,16 +0,0 @@
-bootloader --location=mbr
-network --bootproto=dhcp
-url --url="https://download.rockylinux.org/stg/rocky/8.7-Beta/BaseOS/x86_64/os/"
-lang en_US.UTF-8
-keyboard us
-timezone --utc America/New_York
-clearpart --all
-autopart
-rootpw weakpassword
-user --name=test --password=weakpassword --plaintext
-poweroff
-
-%packages
-@^server-product-environment
-plymouth-system-theme
-%end
diff --git a/server-8.ks b/server-8.ks
index e30eb92..94ce04c 100644
--- a/server-8.ks
+++ b/server-8.ks
@@ -9,6 +9,7 @@ autopart
 rootpw weakpassword
 user --name=test --password=weakpassword --plaintext
 poweroff
+text
 
 %packages
 @^server-product-environment
diff --git a/server.ks b/server.ks
index 9b9daa2..4bd9c31 100644
--- a/server.ks
+++ b/server.ks
@@ -9,6 +9,7 @@ autopart
 rootpw weakpassword
 user --name=test --password=weakpassword --plaintext
 poweroff
+text
 
 %packages
 @^server-product-environment
diff --git a/support-8.7-Beta.ks b/support-8.7-Beta.ks
deleted file mode 100644
index 43f061e..0000000
--- a/support-8.7-Beta.ks
+++ /dev/null
@@ -1,19 +0,0 @@
-bootloader --location=mbr
-network --bootproto=dhcp
-url --url="https://download.rockylinux.org/stg/rocky/8.7-Beta/BaseOS/x86_64/os/"
-#repo --name="epel" --baseurl="http://mirrors.kernel.org/fedora-epel/8/Everything/x86_64/"
-# use epel to keep scsi-target-utils instead of targetcli
-lang en_US.UTF-8
-keyboard us
-timezone --utc America/New_York
-clearpart --all
-autopart
-rootpw weakpassword
-poweroff
-
-%packages
-@core
-targetcli
-nfs-utils
-dnsmasq
-%end
diff --git a/support-8.ks b/support-8.ks
index 5051098..7d3797a 100644
--- a/support-8.ks
+++ b/support-8.ks
@@ -10,6 +10,7 @@ clearpart --all
 autopart
 rootpw weakpassword
 poweroff
+text
 
 %packages
 @core
diff --git a/support.ks b/support.ks
index e39f505..39ccb91 100644
--- a/support.ks
+++ b/support.ks
@@ -10,6 +10,7 @@ clearpart --all
 autopart
 rootpw weakpassword
 poweroff
+text
 
 %packages
 @core