From 7a54df2ea00a3df0c48b973d0bdee4b0a7f743d7 Mon Sep 17 00:00:00 2001
From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Thu, 27 Jan 2022 06:45:47 +0100
Subject: [PATCH] use wpa_supplicant in live

---
 bootstrap.sh         | 22 ++++++++++++--------
 files/quickstart.txt | 49 +++++++++++++++++++++++++++++++++++++++-----
 files/wlp1s0f0       |  3 +++
 3 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 files/wlp1s0f0

diff --git a/bootstrap.sh b/bootstrap.sh
index 8220509..5a9f359 100644
--- 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 .)
 )
 }
 
@@ -127,16 +129,18 @@ build_di_stick()
         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
-        (cd di-stick; tar cf ../m1-d-i-`date "+%Y-%m-%d"`.tar .)
+        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
 cd build
 
-build_m1n1
-build_uboot
-build_linux
-build_rootfs
-build_live_stick
+# build_m1n1
+# build_uboot
+# build_linux
+# build_rootfs
+# build_live_stick
 build_di_stick
-build_fs
+# build_fs
diff --git a/files/quickstart.txt b/files/quickstart.txt
index f7f42ae..61636ac 100644
--- a/files/quickstart.txt
+++ b/files/quickstart.txt
@@ -5,14 +5,53 @@ mount /dev/sda1 /mnt
 tar -C /lib/firmware/ -xf /mnt/linux-firmware.tar
 umount /mnt
 modprobe brcmfmac
-/etc/init.d/iwd start
-ip link set up dev wlan0
+vim /etc/wpa.conf
+wpa_supplicant -i <interface> -c /etc/wpa_supplicant/wpa_supplicant.conf
 dhclient wlan0
 
-iwctl
-station wlan0 connect
-
 # Time
 ntpdate pool.ntp.org
 date --set 2022-01-25
 date --set 14:21
+
+# Fix grub
+apt-get purge grub-efi grub-efi-arm64 grub-efi-arm64-bin grub-efi-arm64-signed
+apt-get install grub-efi-arm64
+grub-install --removable /dev/nvme0n1p4
+# Set removable media to yes and nvram to no
+dpkg-reconfigure dpkg-reconfigure grub-efi-arm64
+update-grub
+find /boot/efi -name fbaa64.efi | xargs rm
+
+See also: https://github.com/AsahiLinux/docs/wiki/U-Boot
+
+
+# xorg
+(air) [~] cat /etc/X11/xorg.conf.d/00-keyboard.conf
+Section "InputClass"
+        Identifier "system-keyboard"
+        MatchIsKeyboard "on"
+        Option "XkbLayout" "us"
+        Option "XkbModel" "pc105"
+        Option "XkbVariant" "de_se_fi"
+        Option "XkbOptions" "ctrl:nocaps"
+EndSection
+(air) [~] cat /etc/X11/xorg.conf.d/30-input.conf
+Section "InputClass"
+  Identifier "libinput touchpad catchall"
+  MatchIsTouchpad "on"
+  MatchDevicePath "/dev/input/event*"
+  Option "Tapping" "False"
+  Option "TappingDrag" "False"
+  Option "DisableWhileTyping" "True"
+  Option "AccelProfile" "adaptive"
+  Option "AccelSpeed" "0.3"
+  Option "AccelerationNumerator" "2"
+  Option "AccelerationDenominator" "1"
+  Option "AccelerationThreshold" "4"
+  Option "AdaptiveDeceleration" "2"
+  Option "NaturalScrolling" "0"
+        Option "TappingButtonMap" "lmr"
+        Option "ClickMethod" "clickfinger"
+  Driver "libinput"
+EndSection
diff --git a/files/wlp1s0f0 b/files/wlp1s0f0
new file mode 100644
index 0000000..07c2e18
--- /dev/null
+++ b/files/wlp1s0f0
@@ -0,0 +1,3 @@
+allow-hotplug wlp1s0f0
+iface wlp1s0f0 inet dhcp
+        wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
-- 
2.39.5