From 91afc465b230d8e058e3341cc2f4b6dc9d8cc6b9 Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Tue, 29 Oct 2019 21:29:36 +0100
Subject: [PATCH] attempt to fix keyboard layout and dns

---
 manjaro-arm-installer | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/manjaro-arm-installer b/manjaro-arm-installer
index 5c5ceed..9d47781 100755
--- a/manjaro-arm-installer
+++ b/manjaro-arm-installer
@@ -193,9 +193,12 @@ create_install() {
     echo "LANG=$LOCALE" | tee --append $TMPDIR/root/etc/locale.conf 1> /dev/null 2>&1
     $NSPAWN $TMPDIR/root locale-gen
     echo "KEYMAP=$KEYMAP" | tee --append $TMPDIR/root/etc/vconsole.conf 1> /dev/null 2>&1
-    $NSPAWN $TMPDIR/root localectl set-x11-keymap $KEYMAP 1> /dev/null 2>&1
+    #$NSPAWN $TMPDIR/root localectl set-x11-keymap $KEYMAP 1> /dev/null 2>&1
+    echo "Section InputClass\nOption XkbLayout $KEYMAP\nEndSection" > $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf
     echo "$HOSTNAME" | tee --append $TMPDIR/root/etc/hostname 1> /dev/null 2>&1
-    $NSPAWN $TMPDIR/root systemctl disable systemd-resolved.service 1> /dev/null 2>&1
+    #$NSPAWN $TMPDIR/root systemctl disable systemd-resolved.service 1> /dev/null 2>&1
+    rm -f $TMPDIR/root/etc/systemd/system/multi-user.target.wants/systemd-resolved.service 
+    rm -f $TMPDIR/root/etc/systemd/system/dbus-org.freedesktop.resolve1.service
 
     echo "Correcting permissions from overlay..."
     chown -R root:root $TMPDIR/root/etc