use wpa_supplicant in live

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index b890105a176247181ba606f162881dea67832504..5a9f35958da0c2774e88abeb237c08f6393228e8 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -52,7 +52,7 @@ build_rootfs()
 {
 (
         sudo rm -rf testing
-        sudo eatmydata debootstrap --arch=arm64 --include initramfs-tools,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
+        sudo eatmydata debootstrap --arch=arm64 --include initramfs-tools,wpasupplicant,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`
 
@@ -68,6 +68,8 @@ build_rootfs()
         sudo cp ../../files/fstab etc/fstab
         sudo cp ../../files/quickstart.txt root/
         sudo cp ../../files/eth0 etc/network/interfaces.d/
+        sudo cp ../../files/wlp1s0f0 etc/network/interfaces.d/
+        sudo cp ../../files/wpa.conf etc/wpa_supplicant/wpa_supplicant.conf
 
         sudo bash -c 'chroot . apt update'
         sudo bash -c 'chroot . apt install -y firmware-linux-free'
@@ -93,7 +95,7 @@ build_live_stick()
         cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi live-stick/efi/boot/bootaa64.efi
         cp testing/boot/vmlinuz* live-stick/vmlinuz
         cp ../files/grub.cfg live-stick/efi/debian/grub.cfg
-        (cd live-stick; tar cf ../asahi-debian-live-`date "+%Y-%m-%d"`.tar .)
+        (cd live-stick; tar cf ../asahi-debian-live.tar .)
 )
 }
 
@@ -116,16 +118,20 @@ build_fs()
 build_di_stick()
 {
         rm -rf di-stick
-        mkdir -p live-stick/efi/boot live-stick/efi/debian/
-        wget https://d-i.debian.org/daily-images/arm64/daily/netboot/debian-installer/arm64/initrd.gz
-        mkdir initrd; cd initrd; gzip -cd ../initrd.gz | sudo cpio -imd --quiet
-        rm -rf initrd/lib/modules/*
-        cp -a ../testing/lib/modules/* initrd/lib/modules/
-        (cd initrd; find . | cpio --quiet -H newc -o | pigz > ../initrd.gz)
-        cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi live-stick/efi/boot/bootaa64.efi
-        cp testing/boot/vmlinuz* live-stick/vmlinuz
-        cp ../files/grub.cfg live-stick/efi/debian/grub.cfg
-        (cd live-stick; tar cf ../m1-d-i-`date "+%Y-%m-%d"`.tar .)
+        mkdir -p di-stick/efi/boot di-stick/efi/debian/
+        test -f initrd.gz || wget https://d-i.debian.org/daily-images/arm64/daily/netboot/debian-installer/arm64/initrd.gz
+        sudo rm -rf initrd; mkdir initrd; (cd initrd; gzip -cd ../initrd.gz | sudo cpio -imd --quiet)
+        sudo rm -rf initrd/lib/modules/*
+        sudo cp -a testing/lib/modules/* initrd/lib/modules/
+        sudo cp ../files/wpa.conf initrd/etc/
+        (cd initrd; find . | cpio --quiet -H newc -o | pigz > ../di-stick/initrd.gz)
+        sudo rm -rf initrd
+        cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi di-stick/efi/boot/bootaa64.efi
+        cp testing/boot/vmlinuz* di-stick/vmlinuz
+        cp ../files/grub.cfg di-stick/efi/debian/grub.cfg
+        export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
+        cp ${KERNEL} di-stick/
+        (cd di-stick; tar cf ../m1-d-i.tar .)
 }
 
 mkdir -p build