Merge branch 'master' of 88.198.237.222:/git/m1-debian

[m1-debian] / files / wifi.pl

diff --git a/files/wifi.pl b/files/wifi.pl
index d0f8156b55578c8dec86b83b47135f18942c91d8..a8cb6c3e407b395e335d8f404b4fc6c1a6b475a9 100755 (executable)
--- a/files/wifi.pl
+++ b/files/wifi.pl
@@ -3,7 +3,7 @@
 use strict;
 use warnings FATAL => 'all';
 
-my $firmware_tarball = '/mnt/linux-firmware.tar';
+my $firmware_tarball = '/mnt/vendorfw/firmware.tar';
 my @vfat_devices;
 
 for (`blkid`) {
@@ -16,15 +16,8 @@ for my $dev (@vfat_devices) {
         system("mount -o ro $dev /mnt");
         if (-f $firmware_tarball) {
                 system("tar -C /lib/firmware/ -xf $firmware_tarball");
-                system('rmmod brcmfmac');
-                system('rmmod brcmutil');
-                sleep(1);
-                system('modprobe brcmfmac');
-                sleep(1);
-                system('rmmod brcmfmac');
-                sleep(1);
+                unlink('/etc/modprobe.d/blacklist.conf');
                 system('modprobe brcmfmac');
         }
         system('umount /mnt');
-
 }