X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/cccfe6d57d96f392cb3e49a9998db9fea3bc043f..4af35f19c2a4b2866fc37990126ee07522f87d62:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index fa1edec..bbaf4bf 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -39,6 +39,9 @@ build_rootfs()
         sudo cp ../../files/wpa.conf etc/wpa_supplicant/wpa_supplicant.conf
         sudo cp ../../files/rc.local etc/rc.local
         sudo cp ../../files/30-modeset.conf etc/X11/xorg.conf.d/30-modeset.conf
+        sudo cp ../../files/blacklist.conf etc/modprobe.d/
+
+        sudo perl -p -i -e 's/"quiet"/"net.ifnames=0"/ if /^GRUB_CMDLINE_LINUX_DEFAULT=/' etc/default/grub
 
         sudo bash -c 'chroot . apt update'
         sudo bash -c 'chroot . apt install -y firmware-linux'
@@ -84,26 +87,6 @@ build_dd()
 )
 }
 
-build_efi()
-{
-(
-        rm -rf EFI
-        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 -s UUID -o value media`
-        cat > EFI/debian/grub.cfg <<EOF
-search.fs_uuid ${UUID} root
-linux (\$root)/boot/${VMLINUZ} root=UUID=${UUID} rw
-initrd (\$root)/boot/${INITRD}
-boot
-EOF
-        tar czf efi.tgz EFI
-)
-}
-
 build_asahi_installer_image()
 {
 (
@@ -119,7 +102,7 @@ build_asahi_installer_image()
 
 publish_artefacts()
 {
-        sudo cp efi.tgz asahi-debian-live.tar debian-base.zip /u/
+        sudo cp asahi-debian-live.tar debian-base.zip /u/
 }
 
 mkdir -p build
@@ -129,7 +112,6 @@ sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu l
 
 build_rootfs
 build_dd
-build_efi
 build_asahi_installer_image
 build_live_stick
 publish_artefacts