24.04.1.4-t2 Gemini-T2

t2linux · Apr 28, 2024 · 40a7723 · 40a7723
1 parent 353e31f
commit 40a7723
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/data/eos/modules/shellprocess_fixes_offline.conf b/data/eos/modules/shellprocess_fixes_offline.conf
@@ -9,8 +9,6 @@
 dontChroot: true
 
 script:
- - "cp /etc/calamares/files/nv-modprobe ${ROOT}/usr/lib/modprobe.d/nvidia-utils.conf"
- - "cp /etc/calamares/files/nv-modules-load ${ROOT}/usr/lib/modules-load.d/nvidia-utils.conf"
  - "cp /etc/calamares/files/endeavouros-wallpaper.png ${ROOT}/usr/share/endeavouros/backgrounds/endeavouros-wallpaper.png"
  - "cp -a /etc/calamares/scripts ${ROOT}/etc/calamares/"
  - "rm ${ROOT}/etc/udev/rules.d/99-removables.rules"

diff --git a/data/eos/scripts/cleaner_script.sh b/data/eos/scripts/cleaner_script.sh
@@ -42,13 +42,8 @@ _manage_broadcom_wifi_driver() {
  local targetfile=/tmp/$chroot_path/tmp/$pkgname.txt
  local wifi_pci="$(lspci -k | sed -n '/ Network controller: /,/^[^ \t]/p' | sed '$d')"
 
- if [ -n "$(echo "$wifi_pci" | grep -w Broadcom)" ] ; then
- echo "yes" > $targetfile
- elif [ -n "$(lsusb | grep -w Broadcom)" ] ; then
- echo "yes" > $targetfile
- else
- echo "no" > $targetfile
- fi
+ # We at T2Linux use brcmfmac for Broadcom Wi-Fi and Bluetooth devices.
+ echo "no" > $targetfile
 }
 
 _copy_files(){