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

diff --git a/doc/m1debian.txt b/doc/m1debian.txt
index 1696f4b35c65d75b1e60f37bbb15d1168978d6c5..e2666c23de72972940c3aa272e0dad2bebede990 100644 (file)
--- 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 0a4af10a8da62377ed8f441a530e7959ad106546..a3f0c18d6ca9c76347e6d71adff2b2762dcff247 100644 (file)
--- 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'