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

diff --git a/files/rc.local b/files/rc.local
index 0676911..5e9642e 100755
--- a/files/rc.local
+++ b/files/rc.local
@@ -95,6 +95,7 @@ EOF
 sub
 install_grub
 {
+        system('rm -rf /boot/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");
@@ -136,8 +137,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');