From 48192ea930254526bf4bc99b1a18b2320355e6c1 Mon Sep 17 00:00:00 2001
From: Dariy Nurgaleev <50947177+Darleev@users.noreply.github.com>
Date: Thu, 14 May 2020 23:05:34 +0700
Subject: [PATCH] added fix for systemd ubuntu 18 (#881)

---
 images/linux/scripts/installers/1804/basic.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/images/linux/scripts/installers/1804/basic.sh b/images/linux/scripts/installers/1804/basic.sh
index 2b8c00181..72aa3ccdc 100644
--- a/images/linux/scripts/installers/1804/basic.sh
+++ b/images/linux/scripts/installers/1804/basic.sh
@@ -142,6 +142,13 @@ for cmd in curl file ftp jq netcat ssh parallel rsync shellcheck sudo telnet tim
     fi
 done
 
+# Workaround for systemd-resolve, since sometimes stub resolver does not work properly. Details: https://github.com/actions/virtual-environments/issues/798
+echo "Create resolv.conf link."
+if [[ -f /run/systemd/resolve/resolv.conf ]]; then
+    echo "Create resolv.conf link."
+    ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
+fi
+
 # Document what was added to the image
 echo "Lastly, documenting what we added to the metadata file"
 DocumentInstalledItem "Basic CLI:"