X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/f325b48f70743dd460120126d2c56a1a9a5f0195..1388429a2bcf57724ac39a2ee228b1e4c92f2e41:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 36347b6..71b2774 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 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'
@@ -75,6 +76,7 @@ build_rootfs()
         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
+        sudo bash -c 'apt-get clean'
 )
 }
 
@@ -82,19 +84,12 @@ build_stick()
 {
 (
         rm -rf stick
-        mkdir -p stick/efi/boot
+        mkdir -p stick/efi/boot stick/efi/debian/
         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
-
+        cp files/grub.cfg stick/efi/debian/grub.cfg
+        (cd stick; tar cf ../asahi-debian-live-`date "+%Y-%m-%d"`.tar .)
 )
 }