From 073bb875cd1b828944f576fd0a883847149673bb Mon Sep 17 00:00:00 2001
From: "Lukas F. Hartmann" <lukas@mntre.com>
Date: Wed, 26 Jan 2022 21:27:28 +0100
Subject: [PATCH] mkuserland: keep dns server around until we teach nm to
 reliably do it

---
 reform2-imx8mq/mkuserland3.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/reform2-imx8mq/mkuserland3.sh b/reform2-imx8mq/mkuserland3.sh
index 8beedfa..ef3c989 100755
--- a/reform2-imx8mq/mkuserland3.sh
+++ b/reform2-imx8mq/mkuserland3.sh
@@ -11,6 +11,9 @@ SKEL=./template-skel
 # populate /etc
 cp $ETC/motd target-userland/etc
 
+# FIXME: network-manager fails to create this most of the time,
+# which leads to a bad user experience. we'll gladly change this once
+# we figure out how to make DNS server discovery always work with nm.
 echo "nameserver 8.8.8.8" > target-userland/etc/resolv.conf
 
 chroot target-userland /bin/bash <<EOF
@@ -56,8 +59,4 @@ rm /usr/share/applications/gnome-online-accounts-panel.desktop
 # run font cache
 fc-cache
 
-# remove /etc/resolv.conf leaking into the image from the build host
-touch /etc/resolv.conf
-rm /etc/resolv.conf
-
 EOF
-- 
GitLab