From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Sat, 26 Feb 2022 12:45:00 +0000 (+0100)
Subject: Merge branch 'master' of a.gmvl.de:/git/m1-debian
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/f1d34e6c6cc28c4e2e268b24e546c28a40c5f5d8?hp=b3738efc4d89340e4c5def159b4956df3d80f522

Merge branch 'master' of a.gmvl.de:/git/m1-debian
---

diff --git a/bootstrap.sh b/bootstrap.sh
index 53514a7..143413d 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -72,7 +72,7 @@ build_rootfs()
         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`
 
diff --git a/files/rc.local b/files/rc.local
index 0676911..22d1f24 100755
--- 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);
-        $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');