From 0d0eebbd3985d5baf168c2699bca6c742fe57dd0 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Thu, 21 Sep 2023 18:27:38 -0700
Subject: [PATCH] feat: Add WL driver by default (Disabled by default)

---
 Containerfile                                                  | 2 ++
 main-install.sh                                                | 3 ++-
 system_files/usr/etc/modprobe.d/broadcom-wl-blacklist.conf     | 2 ++
 .../usr/etc/modprobe.d/default-disable-broadcom-wl.conf        | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 system_files/usr/etc/modprobe.d/broadcom-wl-blacklist.conf
 create mode 100644 system_files/usr/etc/modprobe.d/default-disable-broadcom-wl.conf

diff --git a/Containerfile b/Containerfile
index 759f392a..2d397461 100644
--- a/Containerfile
+++ b/Containerfile
@@ -16,6 +16,8 @@ COPY main-packages.json /tmp/main-packages.json
 COPY --from=ghcr.io/ublue-os/config:latest /rpms /tmp/rpms
 COPY --from=ghcr.io/ublue-os/akmods:${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
 
+COPY system_files /
+
 RUN /tmp/main-install.sh
 RUN /tmp/main-post-install.sh
 
diff --git a/main-install.sh b/main-install.sh
index b0727822..a61c2725 100755
--- a/main-install.sh
+++ b/main-install.sh
@@ -37,7 +37,8 @@ if grep -qv "39" <<< $FEDORA_MAJOR_VERSION; then
         /tmp/akmods-rpms/kmods/*xpad-noone*.rpm \
         /tmp/akmods-rpms/kmods/*xone*.rpm \
         /tmp/akmods-rpms/kmods/*openrazer*.rpm \
-        /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm
+        /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \
+        /tmp/akmods-rpms/kmods/*wl*.rpm
 fi
 
 for REPO in $(rpm -ql ublue-os-akmods-addons|grep ^"/etc"|grep repo$); do
diff --git a/system_files/usr/etc/modprobe.d/broadcom-wl-blacklist.conf b/system_files/usr/etc/modprobe.d/broadcom-wl-blacklist.conf
new file mode 100644
index 00000000..40af9405
--- /dev/null
+++ b/system_files/usr/etc/modprobe.d/broadcom-wl-blacklist.conf
@@ -0,0 +1,2 @@
+# This file intentionally left empty to prevent wl package from disabling drivers needed for other hardware by default.
+# If you wish to use wl, delete this file and /etc/modprobe.d/default-disable-broadcom-wl.conf
diff --git a/system_files/usr/etc/modprobe.d/default-disable-broadcom-wl.conf b/system_files/usr/etc/modprobe.d/default-disable-broadcom-wl.conf
new file mode 100644
index 00000000..f2267d1e
--- /dev/null
+++ b/system_files/usr/etc/modprobe.d/default-disable-broadcom-wl.conf
@@ -0,0 +1,3 @@
+# Prevents wl package from loading along side drivers it conflicts with.
+# If you wish to use wl, delete this file and /etc/modprobe.d/broadcom-wl-blacklist.conf
+wl