From c2ef156e2d63ca6534d6d1117a6dea1b9b4b4554 Mon Sep 17 00:00:00 2001
From: Digimer <digimer@alteeve.ca>
Date: Thu, 19 Dec 2019 22:00:31 -0500
Subject: [PATCH] * Did work on adding better offline support for installing
 DHCP/PXE targets on RHEL 8.1

Signed-off-by: Digimer <digimer@alteeve.ca>
---
 Anvil/Tools.pm                      | 10 ++++++++++
 cgi-bin/striker                     |  6 +++---
 html/skins/alteeve/pxe.txt          | 29 ++++++++++++++---------------
 tools/striker-manage-install-target | 10 +++++++---
 4 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/Anvil/Tools.pm b/Anvil/Tools.pm
index dd9071e5..0ef79b46 100644
--- a/Anvil/Tools.pm
+++ b/Anvil/Tools.pm
@@ -906,6 +906,16 @@ sub _set_defaults
 			hash_count			=>	500000,
 			salt_length			=>	16,
 		},
+		# On actual RHEL systems, this will be used to ensure that given repos are enabled on given 
+		# machines types. Obviously, this requires that the host has been subscribed.
+		rhel				=>	{
+			repos				=>	{
+				common				=>	["codeready-builder-for-rhel-8-x86_64-rpms"],
+				dashboard			=>	[],
+				dr				=>	[],
+				node				=>	["rhel-8-for-x86_64-highavailability-rpms"],
+			},
+		},
 		terminal			=>	{
 			columns				=>	80,
 			stty				=>	"",
diff --git a/cgi-bin/striker b/cgi-bin/striker
index 9e7e6bef..1ef4287d 100755
--- a/cgi-bin/striker
+++ b/cgi-bin/striker
@@ -439,17 +439,17 @@ sub process_striker_menu
 		
 		# Are there any bad keys?
 		my $query = "SELECT state_uuid, state_note FROM states WHERE state_name LIKE 'host_key_changed::%';";
-		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { query => $query }});
 		
 		my $results = $anvil->Database->query({query => $query, source => $THIS_FILE, line => __LINE__});
 		my $count   = @{$results};
-		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 
 			results => $results, 
 			count   => $count,
 		}});
 		my $broken_key_icon    = $count ? "broken_key_icon_on.png"  : "broken_key_icon_off.png";
 		my $broken_key_message = $count ? "#!string!striker_0132!#" : "#!string!striker_0131!#";
-		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 
 			broken_key_icon    => $broken_key_icon, 
 			broken_key_message => $broken_key_message,
 		}});
diff --git a/html/skins/alteeve/pxe.txt b/html/skins/alteeve/pxe.txt
index a2502282..4a793272 100644
--- a/html/skins/alteeve/pxe.txt
+++ b/html/skins/alteeve/pxe.txt
@@ -73,26 +73,25 @@ selinux --permissive
 %packages
 @^minimal-environment
 alteeve-el8-repo
-createrepo
-dhcp-server
-firefox
+#createrepo
+#dhcp-server
+#firefox
 gcc
-gdm
-gnome-terminal
-httpd
-nmap
-perl-CGI
-perl-CGI-Carp
+#gdm
+#gnome-terminal
+#httpd
+#nmap
+#perl-CGI
 perl-Data-Dumper
-perl-interpreter
+#perl-interpreter
 perl-NetAddr-IP
-postgresql-server
+#postgresql-server
 rsync
-syslinux
-syslinux-nonlinux
-tftp-server
+#syslinux
+#syslinux-nonlinux
+#tftp-server
 vim
-virt-manager
+#virt-manager
 
 %end
 
diff --git a/tools/striker-manage-install-target b/tools/striker-manage-install-target
index be6720f9..34243386 100755
--- a/tools/striker-manage-install-target
+++ b/tools/striker-manage-install-target
@@ -1188,8 +1188,6 @@ sub load_packages
 			"chkconfig.x86_64",
 			"chrony.x86_64",
 			"cifs-utils.x86_64",
-			"clufter-bin.x86_64",
-			"clufter-common.noarch",
 			"clutter-gst3.x86_64",
 			"clutter-gtk.x86_64",
 			"clutter.x86_64",
@@ -1273,6 +1271,7 @@ sub load_packages
 			"elfutils-libs.x86_64",
 			"emacs-filesystem.noarch",
 			"enchant.x86_64",
+			"enchant2.x86_64 ",
 			"ethtool.x86_64",
 			"evolution-data-server-langpacks.noarch",
 			"evolution-data-server.x86_64",
@@ -1328,10 +1327,12 @@ sub load_packages
 			"firewalld-filesystem.noarch",
 			"firewalld.noarch",
 			"flac-libs.x86_64",
+			"flatpak.x86_64",
 			"fontconfig.x86_64",
 			"fontpackages-filesystem.noarch",
 			"freetype.x86_64",
 			"fribidi.x86_64",
+			"fuse.x86_64",
 			"fuse-libs.x86_64",
 		],
 		g	=>	[
@@ -1409,6 +1410,7 @@ sub load_packages
 			"gssproxy.x86_64",
 			"gstreamer1-plugins-base.x86_64",
 			"gstreamer1.x86_64",
+			"gtksourceview3.x86_64",
 			"gtk-update-icon-cache.x86_64",
 			"gtk-vnc2.x86_64",
 			"gtk2.x86_64",
@@ -2076,7 +2078,6 @@ sub load_packages
 			"python3-cairo.x86_64",
 			"python3-cffi.x86_64",
 			"python3-chardet.noarch",
-			"python3-clufter.noarch",
 			"python3-configobj.noarch",
 			"python3-cryptography.x86_64",
 			"python3-dateutil.noarch",
@@ -2270,6 +2271,7 @@ sub load_packages
 			"vte291.x86_64",
 		],
 		w	=>	[
+			"webkit2gtk3.x86_64",
 			"webkit2gtk3-jsc.x86_64",
 			"webkit2gtk3-plugin-process-gtk2.x86_64",
 			"webkit2gtk3.x86_64",
@@ -2281,6 +2283,8 @@ sub load_packages
 		],
 		x	=>	[
 			"xcb-util.x86_64",
+			"xdg-desktop-portal.x86_64",
+			"xdg-desktop-portal-gtk.x86_64",
 			"xfsprogs.x86_64",
 			"xkeyboard-config.noarch",
 			"xml-common.noarch",