X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/7022d096c61fc3ef85ed723e677a474b2f320f58..5e94a44a7ba494c917a0bd2efaded5ae0c817cc6:/files/rc.local?ds=inline

diff --git a/files/rc.local b/files/rc.local
index cef9c92..cb4e021 100755
--- a/files/rc.local
+++ b/files/rc.local
@@ -85,12 +85,13 @@ EOF
 sub
 install_grub
 {
-        system('rm -rf /boot/efi/*');
+        system('rm -rf /boot/efi/EFI');
         system('apt-get install -y grub-efi-arm64-signed-');
         system("echo 'grub-efi-arm64 grub2/update_nvram boolean false' | debconf-set-selections");
         system("echo 'grub-efi-arm64 grub2/force_efi_extra_removable boolean true' | debconf-set-selections");
-        system("dpkg-reconfigure -fnoninteractive grub-efi-arm64");
-        system("update-grub");
+        system('dpkg-reconfigure -fnoninteractive grub-efi-arm64');
+        system('update-grub');
+        system('grub-install --removable /boot/efi');
 }
 
 sub
@@ -106,19 +107,12 @@ update_wifi_firmware_if_necessary
         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;
-my $final_root_fs_uuid = undef;
 my $efi_block_device = undef;
 my $efi_fs_uuid = undef;
 
@@ -127,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("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);
-        $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();
 }