X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/fb2efba40d90ec1d3b39c4f4d266013bca180101..f4dfa7bef7a24dbb455665fdfa5811c8c0792e93:/files/rc.local

diff --git a/files/rc.local b/files/rc.local
index 0676911..597acd1 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
-# [x] change uuid of ext4
-
-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
@@ -136,8 +128,9 @@ 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);
-        $efi_fs_uuid = find_fs_uuid_of_device($efi_block_device);
+        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);
         system('mount /boot/efi');