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

systemd: remove rudimentary network checking code; depend on NetworkManager #127

Merged
merged 3 commits into from
Jan 7, 2020
Merged

systemd: remove rudimentary network checking code; depend on NetworkManager #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc14b5e
systemd: make "network up" checking more robust
dustymabe Jan 7, 2020
35b41f9
systemd: Add After=network-online.target
cgwalters Jan 7, 2020
e7502b4
systemd: remove rudimentary network checking code
dustymabe Jan 7, 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
15 changes: 0 additions & 15 deletions systemd/coreos-installer-service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,6 @@ copy_arg() {
fi
}

# Wait for the network to be up by trying to HEAD a URL.
# If an image URL was specified, use that.
check_url="$(karg coreos.inst.image_url)"
# Otherwise, an Ignition config URL.
check_url="${check_url:-$(karg coreos.inst.ignition_url)}"
# Otherwise, fall back to a globally accessible URL. Try this last because
# we might not have access to the Internet.
check_url="${check_url:-http://fedoraproject.org/static/hotspot.txt}"
# We'd like to disable the progress meter but we can only do that completely
# with --silent, which also disables status updates. Use the compact
# progress bar instead, since at least it's smaller.
curl --head --progress-bar --fail \
--retry 60 --retry-delay 1 --retry-connrefused \
-o /dev/null "${check_url}"

# Get install device
device="$(karg coreos.inst.install_dev)"
if [ -z "${device}" ]; then
Expand Down
1 change: 1 addition & 0 deletions systemd/coreos-installer.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[Unit]
Description=CoreOS Installer
Before=coreos-installer.target
After=network-online.target
Wants=network-online.target
ConditionKernelCommandLine=coreos.inst.install_dev

Expand Down