From 30255292e2315d0dad5b6516fc0df3d0f58027a4 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:41:58 -0400
Subject: [PATCH] Add blacklisting in installer

---
 buildiso.sh              | 6 ++++++
 templates/blacklist.conf | 1 +
 templates/install.sh     | 1 -
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 templates/blacklist.conf

diff --git a/buildiso.sh b/buildiso.sh
index 3dea423..6c03885 100755
--- a/buildiso.sh
+++ b/buildiso.sh
@@ -122,6 +122,12 @@ cp ../../templates/theme.txt config/includes.chroot/boot/grub/theme.txt || fail
 cp ../../templates/splash.png config/includes.chroot/splash.png || fail "Failed to copy critical template file"
 echo "done."
 
+# Install module blacklist template
+echo -n "Copying module blacklist template... "
+mkdir -p config/includes.chroot/etc/modprobe.d
+cp ../../templates/blacklist.conf config/includes.chroot/etc/modprobe.d/blacklist.conf || fail "Failed to copy critical template file"
+echo "done."
+
 # Install install.sh script
 echo -n "Copying PVC node installer script template... "
 cp ../../templates/install.sh config/includes.chroot/install.sh || fail "Failed to copy critical template file"
diff --git a/templates/blacklist.conf b/templates/blacklist.conf
new file mode 100644
index 0000000..b45f157
--- /dev/null
+++ b/templates/blacklist.conf
@@ -0,0 +1 @@
+blacklist hpwdt
diff --git a/templates/install.sh b/templates/install.sh
index 073a2b1..84c414e 100755
--- a/templates/install.sh
+++ b/templates/install.sh
@@ -869,7 +869,6 @@ EOF
         true
     ;;
 esac
-echo "done."
 
 echo -n "Setting temporary 'root' password... "
 echo "root:${root_password}" | chroot ${target} chpasswd >&2