daily arm64 d-i initrd is gone

[m1-debian] / files / rc.local

diff --git a/files/rc.local b/files/rc.local
index 47dde6aac034e75a09473edaab7561cd63b49ab4..e6f9c6d205651639807396e78ed46e35c6870c2b 100755 (executable)
--- a/files/rc.local
+++ b/files/rc.local
@@ -12,6 +12,7 @@
 
 my $firmware_tarball = '/boot/efi/linux-firmware.tar';
 my $firmware_manifest = '/lib/firmware/ASAHI_FIRMWARE_MANIFEST';
 
 my $firmware_tarball = '/boot/efi/linux-firmware.tar';
 my $firmware_manifest = '/lib/firmware/ASAHI_FIRMWARE_MANIFEST';

+my $grubcfg = '/mnt/EFI/debian/grub.cfg';

 
 sub
 find_root_device
 
 sub
 find_root_device


@@ -58,8 +59,8 @@ find_efi_parition
 
         for my $dev (@candidates) {
                 system("mount -o ro $dev /mnt");
 
         for my $dev (@candidates) {
                 system("mount -o ro $dev /mnt");

-                        if (-f '/mnt/EFI/boot/grub.cfg') {
-                                open(GRUBCFG, '<', '/mnt/EFI/boot/grub.cfg') || die ("Can't open /mnt/EFI/boot/grub.cfg: $!");
+                        if (-f $grubcfg) {
+                                open(GRUBCFG, '<', $grubcfg) || die ("Can't open $grubcfg: $!");

                                 my @lines = <GRUBCFG>;
                                 for (@lines) {
                                         if (/${uuid_in_grub_cfg}/) {
                                 my @lines = <GRUBCFG>;
                                 for (@lines) {
                                         if (/${uuid_in_grub_cfg}/) {


@@ -85,7 +86,6 @@ generate_fstab
 
         open(FSTAB, '>', '/etc/fstab') || die ("Can not open fstab");
         print FSTAB <<EOF;
 
         open(FSTAB, '>', '/etc/fstab') || die ("Can not open fstab");
         print FSTAB <<EOF;

-

 UUID="$root_fs_uuid" /         ext4 defaults 0 0
 UUID="$efi_fs_uuid"  /boot/efi vfat defaults 0 0
 EOF
 UUID="$root_fs_uuid" /         ext4 defaults 0 0
 UUID="$efi_fs_uuid"  /boot/efi vfat defaults 0 0
 EOF


@@ -99,6 +99,7 @@ install_grub
         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("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");

 }
 
 sub
 }
 
 sub


@@ -129,7 +130,7 @@ my $root_fs_uuid = undef;
 my $efi_block_device = undef;
 my $efi_fs_uuid = undef;
 
 my $efi_block_device = undef;
 my $efi_fs_uuid = undef;
 

-unless (-f '/etc/fstab') {
+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);
         $root_block_device = find_root_device();
         system("resize2fs $root_block_device");
         $root_fs_uuid = find_fs_uuid_of_device($root_block_device);