give esp a new uuid

diff --git a/bootstrap.sh b/bootstrap.sh
index 53514a71f07a948fb0438a1fb4a01acd460a87b7..143413de4e173e1b11a3bd389e45d1cee7ed1706 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -72,7 +72,7 @@ build_rootfs()
         handle_crosscompile
         sudo rm -rf testing
         mkdir -p cache
         handle_crosscompile
         sudo rm -rf testing
         mkdir -p cache

-        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client testing testing http://ftp.fau.de/debian
+        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mlabel testing testing http://ftp.fau.de/debian

 
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
 
 
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
 

diff --git a/files/rc.local b/files/rc.local
index 06769117c44b4feef7a90dbb27c4f9d98fbbc564..22d1f240df8a770ad4180e750ce7220962f26f47 100755 (executable)
--- a/files/rc.local
+++ b/files/rc.local
@@ -136,8 +136,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);
         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}");
         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');
         $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');