X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/5bd8c45bc4000403e2797f87c54960cabcf1ce04..b19a86bab32e61abbf008bbe6ded394b08f22dac:/files/rc.local?ds=sidebyside

diff --git a/files/rc.local b/files/rc.local
index e6f9c6d..cb4e021 100755
--- a/files/rc.local
+++ b/files/rc.local
@@ -1,16 +1,6 @@
 #!/usr/bin/perl
 
-# [x] resize root filesystem
-# [x] find root fs uuid
-# [x] find boot partition
-# [x] generate fstab
-# [x] mount /boot/efi
-# [x] install grub
-# [x] extract wifi firmware
-# [ ] on life system skip everything but wifi firmware
-# [ ] In order to change the uuid of the root filesystem, bootstrap.sh must remember it in a file within the mounted disk image. And the initrd needs to change it.
-
-my $firmware_tarball = '/boot/efi/linux-firmware.tar';
+my $firmware_tarball = '/boot/efi/vendorfw/firmware.tar';
 my $firmware_manifest = '/lib/firmware/ASAHI_FIRMWARE_MANIFEST';
 my $grubcfg = '/mnt/EFI/debian/grub.cfg';
 
@@ -95,11 +85,13 @@ EOF
 sub
 install_grub
 {
+        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
@@ -115,28 +107,22 @@ 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 $root_fs_uuid = undef;
+my $initial_root_fs_uuid = undef;
 my $efi_block_device = undef;
 my $efi_fs_uuid = undef;
 
 unless (-f '/boot/grub/grub.cfg') {
         $root_block_device = find_root_device();
         system("resize2fs $root_block_device");
-        $root_fs_uuid = find_fs_uuid_of_device($root_block_device);
-        $efi_block_device = find_efi_parition($root_fs_uuid);
+        $initial_root_fs_uuid = find_fs_uuid_of_device($root_block_device);
+        $efi_block_device = find_efi_parition($initial_root_fs_uuid);
         $efi_fs_uuid = find_fs_uuid_of_device($efi_block_device);
-        generate_fstab($root_fs_uuid, $efi_fs_uuid);
+        generate_fstab($initial_root_fs_uuid, $efi_fs_uuid);
         system('mount /boot/efi');
         install_grub();
 }