work on the live system

diff --git a/bootstrap.sh b/bootstrap.sh
index 6cc20f259314db6ae457af5ab985924f74fb14db..870f4249dcde7e2bd822484df1eb0d845e4095ce 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -54,16 +54,18 @@ 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,ca-certificates,sudo,openssh-client testing testing http://ftp.fau.de/debian
 
+        export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
+
         cd testing
 
         sudo bash -c 'echo live > etc/hostname'
 
         sudo bash -c 'echo > etc/motd'
 
-        sudo cp ../files/sources.list etc/apt/sources.list
-        sudo cp ../files/hosts etc/hosts
-        sudo cp ../files/quickstart.txt root/
-        sudo cp ../files/eth0 etc/network/interfaces.d/
+        sudo cp ../../files/sources.list etc/apt/sources.list
+        sudo cp ../../files/hosts etc/hosts
+        sudo cp ../../files/quickstart.txt root/
+        sudo cp ../../files/eth0 etc/network/interfaces.d/
 
         sudo bash -c 'chroot . apt update'
         sudo bash -c 'chroot . apt install -y firmware-linux'
@@ -72,11 +74,10 @@ build_rootfs()
 
         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 cp ../${KERNEL} .
+        sudo chroot . dpkg -i ${KERNEL}
+        sudo rm ${KERNEL}
 
-        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'
 )
 }
@@ -89,11 +90,14 @@ build_stick()
         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
-        cp files/grub.cfg stick/efi/debian/grub.cfg
+        cp ../files/grub.cfg stick/efi/debian/grub.cfg
         (cd stick; tar cf ../asahi-debian-live-`date "+%Y-%m-%d"`.tar .)
 )
 }
 
+mkdir -p build
+cd build
+
 # build_m1n1
 # build_uboot
 # build_linux

diff --git a/files/sources.list b/files/sources.list
index a36e253ce1143555b60171a0cbd541280dc7bc1c..4c40d633c31a697077f1b2fa415470f7be8368c4 100644 (file)
--- a/files/sources.list
+++ b/files/sources.list
@@ -1,2 +1,2 @@
-deb http://deb.debian.org/debian testing main contrib non-free
-deb-src http://deb.debian.org/debian testing main contrib non-free
+deb http://ftp.fau.de/debian testing main contrib non-free
+deb-src http://ftp.fau.de/debian testing main contrib non-free