From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Tue, 25 Jan 2022 13:20:37 +0000 (+0100)
Subject: boot grub.cfg in the right place use files instead of here documents
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/2032f8a78af9e80d5a5737da2d66ac864c27b1ef

boot grub.cfg in the right place use files instead of here documents
---

diff --git a/bootstrap.sh b/bootstrap.sh
index 7582b15..b16a61c 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -52,7 +52,7 @@ build_rootfs()
 {
 (
         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,dbus testing testing http://ftp.fau.de/debian
+        sudo eatmydata debootstrap --arch=arm64 --include iwd,tcpdump,vim,tmux,vlan,ntpdate,bridge-utils,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client testing testing http://ftp.fau.de/debian
 
         cd testing
 
@@ -60,8 +60,9 @@ build_rootfs()
 
         sudo bash -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 cp ../files/sources.list etc/apt/sources.list
+        sudo cp ../files/hosts etc/hosts
+        sudo cp ../files/quickstart.txt root/
 
         sudo bash -c 'chroot . apt update'
         sudo bash -c 'chroot . apt install -y firmware-linux'
@@ -83,24 +84,16 @@ build_stick()
 {
 (
         rm -rf stick
-        mkdir -p stick/efi/boot stick/boot
+        mkdir -p stick/efi/boot stick/efi/debian/grub.cfg
         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/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
-
+        cp files/grub.cfg stick/efi/debian/grub.cfg
 )
 }
 
 # build_m1n1
 # build_uboot
 # build_linux
-# build_rootfs
+build_rootfs
 build_stick