Skip to content

[rhcos-4.8] 35coreos-live: stop overriding NetworkManager-wait-online timeout to 5s #1120

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

Merged
jlebon merged 1 commit into from
Jul 19, 2021
Merged

[rhcos-4.8] 35coreos-live: stop overriding NetworkManager-wait-online timeout to 5s #1120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 0 additions & 23 deletions .../usr/lib/dracut/modules.d/35coreos-live/coreos-liveiso-reconfigure-nm-wait-online.service
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/live-generator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ add_requires sysroot.mount initrd-root-fs.target
add_requires sysroot-etc.mount initrd-root-fs.target
add_requires sysroot-var.mount initrd-root-fs.target

add_requires coreos-liveiso-reconfigure-nm-wait-online.service initrd.target

mkdir -p "${UNIT_DIR}/ostree-prepare-root.service.d"
cat > "${UNIT_DIR}/ostree-prepare-root.service.d/10-live.conf" <<EOF
# With live PXE there's no ostree= argument on the kernel command line, so
Expand Down
3 changes: 0 additions & 3 deletions overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,4 @@ install() {

install_and_enable_unit "coreos-livepxe-persist-osmet.service" \
"default.target"

inst_simple "$moddir/coreos-liveiso-reconfigure-nm-wait-online.service" \
"$systemdsystemunitdir/coreos-liveiso-reconfigure-nm-wait-online.service"
}
8 changes: 8 additions & 0 deletions tests/kola/misc-ro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,3 +190,11 @@ case "$stream" in
fi
;;
esac

# We shouldn't pull this into the transaction by default. See
# https://github.com/coreos/fedora-coreos-config/pull/1088
# https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/
if ! systemctl show -p ActiveState network-online.target | grep -q ActiveState=inactive; then
fatal "Unit network-online.target shouldn't be active"
fi
ok "unit network-online.target inactive"