working on the stick

diff --git a/bootstrap.sh b/bootstrap.sh
index 6c4d615069f9206ff61538ab05debab96a865520..36347b6d0dfd616a41a064a4c834ab1c94be32e9 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -48,46 +48,58 @@ build_linux()
 )
 }
 
-build_initrd()
+build_rootfs()
 {
 (
-
-        rm -rf testing
-        sudo eatmydata debootstrap --arch=arm64 --include iwd,tcpdump,vim,tmux,vlan,firmware-linux,ntpdate,bridge-utils,parted,curl,wget,grub-efi-arm64 testing testing http://ftp.fau.de/debian
+        sudo rm -rf testing
+        sudo eatmydata debootstrap --arch=arm64 --include iwd,tcpdump,vim,tmux,vlan,ntpdate,bridge-utils,parted,curl,wget,grub-efi-arm64,mtr-tiny testing testing http://ftp.fau.de/debian
 
         cd testing
 
-        sudo -c 'echo live > etc/hostname'
+        sudo bash -c 'echo live > etc/hostname'
+
+        sudo bash -c 'echo > etc/motd'
 
-        sudo -c 'echo > etc/motd'
+        sudo bash -c 'echo "deb http://deb.debian.org/debian testing main contrib non-free" > etc/apt/sources.list'
+        sudo bash -c 'echo "deb-src http://deb.debian.org/debian testing main contrib non-free" >> etc/apt/sources.list'
 
-        sudo -c 'echo "deb http://deb.debian.org/debian testing main contrib non-free" > /etc/apt/sources.list'
-        sudo -c 'echo "deb-src http://deb.debian.org/debian testing main contrib non-free" > /etc/apt/sources.list'
+        sudo bash -c 'chroot . apt update'
+        sudo bash -c 'chroot . apt install -y firmware-linux'
 
         sudo -- perl -p -i -e 's/root:x:/root::/' etc/passwd
 
-        sudo ln -s lib/systemd/systemd init
+        sudo -- ln -s lib/systemd/systemd init
 
         sudo cp ../linux-image-5.16.0-asahi-next-20220118-gdcd14bb2ec40_5.16.0-asahi-next-20220118-gdcd14bb2ec40-1_arm64.deb .
 
         sudo chroot . dpkg -i linux-image-5.16.0-asahi-next-20220118-gdcd14bb2ec40_5.16.0-asahi-next-20220118-gdcd14bb2ec40-1_arm64.deb
 
         sudo rm linux-image-5.16.0-asahi-next-20220118-gdcd14bb2ec40_5.16.0-asahi-next-20220118-gdcd14bb2ec40-1_arm64.deb
-
 )
 }
 
-# build_stick()
-# {
-# (
-#         # find . | cpio --quiet -H newc -o | pigz > ../stick/initrd.gz
-#         # cp /boot/efi/EFI/BOOT/BOOTAA64.EFI efi/boot/
-#         # cp /boot/vmlinuz-5.16.0-asahi-next-20220118-14779-ga4d177b3ad21-dirty vmlinuz
-# )
-# }
+build_stick()
+{
+(
+        rm -rf stick
+        mkdir -p stick/efi/boot
+        sudo bash -c 'cd testing; find . | cpio --quiet -H newc -o | pigz > ../stick/initrd.gz'
+        cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi stick/efi/boot/bootaa64.efi
+        cp testing/boot/vmlinuz* stick/vmlinuz
+
+        cat > stick/efi/boot/grub.cfg <<EOF
+echo Loading Kernel...
+linux (hd0,msdos1)/vmlinuz net.ifnames=0
+echo Loading initrd... Please wait
+initrd (hd0,msdos1)/initrd.gz
+boot
+EOF
+
+)
+}
 
 # build_m1n1
 # build_uboot
 # build_linux
-build_initrd
-# build_stick
+# build_rootfs
+build_stick