X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/60b2ebc126f8ba2cfefd58885f7d9625aea63405..89dc4b590bb5df8596da3858f3e5c7c88417a703:/files/rc.local?ds=sidebyside diff --git a/files/rc.local b/files/rc.local index 68ebbc0..74780d4 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 -# [ ] In order to change the uuid of the root filesystem, bootstrap.sh must remember it in a file within the mounted disk image. And the initrd needs to change it. - -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'; @@ -86,7 +76,6 @@ generate_fstab 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 @@ -96,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 @@ -127,17 +118,17 @@ update_wifi_firmware_if_necessary } my $root_block_device = undef; -my $root_fs_uuid = undef; +my $initial_root_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); - $efi_block_device = find_efi_parition($root_fs_uuid); + $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); - generate_fstab($root_fs_uuid, $efi_fs_uuid); + generate_fstab($initial_root_fs_uuid, $efi_fs_uuid); system('mount /boot/efi'); install_grub(); }