Merge branch 'master' of agrajag.zerfleddert.de:/git/m1-debian

[m1-debian] / files / rc.local

diff --git a/files/rc.local b/files/rc.local
index 597acd10ad4faac2139502bc1cb6626480649b67..cb4e02127573abea2a68cd9d68a63555da00fcca 100755 (executable)
--- a/files/rc.local
+++ b/files/rc.local
@@ -107,19 +107,12 @@ update_wifi_firmware_if_necessary
         system("sha256sum $firmware_tarball > $firmware_manifest");
         system("tar -C /lib/firmware/ -xf $firmware_tarball");
 
         system("sha256sum $firmware_tarball > $firmware_manifest");
         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');
 }
 
 my $root_block_device = undef;
 my $initial_root_fs_uuid = undef;
         system('modprobe brcmfmac');
 }
 
 my $root_block_device = undef;
 my $initial_root_fs_uuid = undef;

-my $final_root_fs_uuid = undef;

 my $efi_block_device = undef;
 my $efi_fs_uuid = undef;
 
 my $efi_block_device = undef;
 my $efi_fs_uuid = undef;
 


@@ -128,11 +121,8 @@ unless (-f '/boot/grub/grub.cfg') {
         system("resize2fs $root_block_device");
         $initial_root_fs_uuid = find_fs_uuid_of_device($root_block_device);
         $efi_block_device = find_efi_parition($initial_root_fs_uuid);
         system("resize2fs $root_block_device");
         $initial_root_fs_uuid = find_fs_uuid_of_device($root_block_device);
         $efi_block_device = find_efi_parition($initial_root_fs_uuid);

-        system("mlabel -s -n :: -i $efi_block_device");
-        system("tune2fs -U random ${root_block_device}");

         $efi_fs_uuid = find_fs_uuid_of_device($efi_block_device);
         $efi_fs_uuid = find_fs_uuid_of_device($efi_block_device);

-        $final_root_fs_uuid = find_fs_uuid_of_device($root_block_device);
-        generate_fstab($final_root_fs_uuid, $efi_fs_uuid);
+        generate_fstab($initial_root_fs_uuid, $efi_fs_uuid);

         system('mount /boot/efi');
         install_grub();
 }
         system('mount /boot/efi');
         install_grub();
 }