summaryrefslogtreecommitdiff
path: root/configs/releng
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-04-27 08:35:04 +0200
committerErich Eckner <git@eckner.net>2018-04-27 08:35:04 +0200
commit2d04c856261ffd81ee723b4f3df9bef05148a005 (patch)
treed7e5361e4191d42cc574403b6a7572214f036a3b /configs/releng
parent1e308c7bfd4ad811475544531a1255303afbed31 (diff)
parent39bd71c25c1910f8c42705170af42fdd7d46fe3c (diff)
downloadarchiso32-2d04c856261ffd81ee723b4f3df9bef05148a005.tar.xz
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'configs/releng')
-rw-r--r--configs/releng/airootfs/etc/modprobe.d/broadcom-wl.conf7
-rw-r--r--configs/releng/packages.both1
2 files changed, 8 insertions, 0 deletions
diff --git a/configs/releng/airootfs/etc/modprobe.d/broadcom-wl.conf b/configs/releng/airootfs/etc/modprobe.d/broadcom-wl.conf
new file mode 100644
index 0000000..0eae70c
--- /dev/null
+++ b/configs/releng/airootfs/etc/modprobe.d/broadcom-wl.conf
@@ -0,0 +1,7 @@
+# The broadcom-wl package requires some modules to be disabled in order to use
+# wl. Since the ISO image needs to cover many hardware cases, this file
+# overrides the default blacklist in /usr/lib/modprobe.d/
+#
+# If you need to use wl, you may need to delete this file, then `rmmod` any
+# already-loaded modules that are now blacklisted before proceeding to modprobe
+# wl itself.
diff --git a/configs/releng/packages.both b/configs/releng/packages.both
index 9768e53..a9fad8d 100644
--- a/configs/releng/packages.both
+++ b/configs/releng/packages.both
@@ -1,5 +1,6 @@
arch-install-scripts
b43-fwcutter
+broadcom-wl
btrfs-progs
clonezilla
crda