fix installer

diff --git a/bootstrap.sh b/bootstrap.sh
index 022dc07b81424af955268371698ad176adc6d0e9..5deb705b0d2f11dbd954c596851fe2e47f89ab14 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -78,6 +78,8 @@ build_rootfs()
 
         cd testing
 
 
         cd testing
 

+        mkdir -p boot/efi
+

         sudo bash -c 'echo live > etc/hostname'
 
         sudo bash -c 'echo > etc/motd'
         sudo bash -c 'echo live > etc/hostname'
 
         sudo bash -c 'echo > etc/motd'


@@ -138,17 +140,16 @@ build_efi()
 {
 (
         rm -rf EFI
 {
 (
         rm -rf EFI

-        mkdir -p EFI/boot
+        mkdir -p EFI/boot EFI/debian

         cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi EFI/boot/bootaa64.efi
 
         export INITRD=`ls -1 testing/boot/ | grep initrd`
         export VMLINUZ=`ls -1 testing/boot/ | grep vmlinuz`
         export UUID=`blkid media | awk -F\" '{print $2}'`
         cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi EFI/boot/bootaa64.efi
 
         export INITRD=`ls -1 testing/boot/ | grep initrd`
         export VMLINUZ=`ls -1 testing/boot/ | grep vmlinuz`
         export UUID=`blkid media | awk -F\" '{print $2}'`

-        cat > EFI/boot/grub.cfg <<EOF
+        cat > EFI/debian/grub.cfg <<EOF

 search.fs_uuid ${UUID} root
 search.fs_uuid ${UUID} root

-set prefix=(\$root)'/boot/'
-linux $VMLINUZ root=UUID=${UUID} ro
-inird $INITRD
+linux (\$root)/boot/${VMLINUZ} root=UUID=${UUID} rw
+initrd (\$root)/boot/${INITRD}

 boot
 EOF
         tar czf efi.tgz EFI
 boot
 EOF
         tar czf efi.tgz EFI

diff --git a/files/grub.cfg b/files/grub.cfg
index 1c4e01c39e3ef49a618d178bde2d39347b3d06c0..0516360149e9bc6408d946bb5972d052031d4e2a 100644 (file)
--- a/files/grub.cfg
+++ b/files/grub.cfg
@@ -1,5 +1,5 @@
 echo Loading Kernel...
 echo Loading Kernel...

-linux (hd0,msdos1)/vmlinuz expert net.ifnames=0
+linux (hd0,msdos1)/vmlinuz expert

 echo Loading initrd... Please wait
 initrd (hd0,msdos1)/initrd.gz
 boot
 echo Loading initrd... Please wait
 initrd (hd0,msdos1)/initrd.gz
 boot

diff --git a/files/interfaces b/files/interfaces
index dc11ca971546a8f3ec9cb0f201d6af58d60fbd51..fa74c25442445631f6a95e360bf58b27a3c5c268 100644 (file)
--- a/files/interfaces
+++ b/files/interfaces
@@ -2,9 +2,6 @@
 # Include files from /etc/network/interfaces.d:
 source /etc/network/interfaces.d/*
 
 # Include files from /etc/network/interfaces.d:
 source /etc/network/interfaces.d/*
 

-auto eth0
-iface eth0 inet dhcp
-
-auto wlan0
-iface wlan0 inet dhcp
+allow-hotplug wlp1s0f0
+iface wlp1s0f0 inet dhcp

         wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
         wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf

diff --git a/files/rc.local b/files/rc.local
index 47dde6aac034e75a09473edaab7561cd63b49ab4..68ebbc049470ae060a6cdb549d777bbb594b043c 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}/) {


@@ -99,6 +100,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