diff options
| author | Erich Eckner <git@eckner.net> | 2018-04-27 08:35:13 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-04-27 08:35:13 +0200 |
| commit | 6ef87833022e440cfdfe9a89a649c62d76ce0911 (patch) | |
| tree | fb45a3e38fee02e1869bd250dbdeffb54049ac7e | |
| parent | 5768b9a4a43989556684e632190411a476254e8f (diff) | |
| parent | 39bd71c25c1910f8c42705170af42fdd7d46fe3c (diff) | |
| download | archiso32-6ef87833022e440cfdfe9a89a649c62d76ce0911.tar.xz | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | configs/releng/airootfs/etc/modprobe.d/broadcom-wl.conf | 7 | ||||
| -rw-r--r-- | configs/releng/packages.both | 1 |
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 |