From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Sun, 20 Feb 2022 06:46:36 +0000 (+0100)
Subject: Merge branch 'master' of a.gmvl.de:/git/m1-debian
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/8993761863e1c6c8bca5e0c5c27939ba8f8ac68f?hp=f1f2b82f8214511b6de0d8b38e10145ce85e69c1

Merge branch 'master' of a.gmvl.de:/git/m1-debian
---

diff --git a/doc/m1debian.txt b/doc/m1debian.txt
index 1696f4b..e2666c2 100644
--- a/doc/m1debian.txt
+++ b/doc/m1debian.txt
@@ -34,7 +34,11 @@ curl -L https://tg.st/u/m1.tgz | tar -xOz | dd of=/dev/<identifier of Linux File
 
 vi /etc/fstab
 
-grub-install --removable /dev/nvme0n1p4
+# We deinstall grub-efi-arm64-signed- because it creates a file fbaa64.efi
+# which makes u-boot hang.
+apt-get install grub-efi grub-efi-arm64-signed-
+grub-install --target=arm64-efi --efi-directory=/boot/efi --removable
+# Set removable media to yes and nvram to no to make later grub updates work
 dpkg-reconfigure grub-efi-arm64
 
 update-initramfs -k all -c
diff --git a/files/quickstart.txt b/files/quickstart.txt
index 0a4af10..a3f0c18 100644
--- a/files/quickstart.txt
+++ b/files/quickstart.txt
@@ -51,7 +51,7 @@ EndSection
 EOF
 
 # Swap command and option (windows and alt like on a pc keyboard)
-setxkbmap -option altwin:swap_alt_win
+echo 1 > /sys/module/hid_apple/parameters/swap_opt_cmd
 
 # Configure the touchpad
 cat > /etc/X11/xorg.conf.d/30-input.conf <<'EOF'