Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Ubuntu 18] systemd-resolve workaround #881

Merged
merged 2 commits into from
May 14, 2020
Merged

[Ubuntu 18] systemd-resolve workaround #881

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a10bb04
added fix for systemd ubuntu 18
Darleev May 13, 2020
d5c0e88
Merge remote-tracking branch 'upstream/master' into v-danurg/systemd_…
Darleev May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions images/linux/scripts/installers/1804/basic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down