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

Move to conditional networking #426

Merged
merged 3 commits into from
Jul 15, 2020
Merged

Move to conditional networking #426

merged 3 commits into from
Jul 15, 2020

Commits on Jul 15, 2020

  1. tests/misc-ro: generalize NIC naming test 

    Instead of checking for `ens` on QEMU, just check that the interface
name *isn't* `eth*`. This should be cross-platform, so we can drop the
`systemd-run` wrapper.
    @jlebon
    jlebon committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    b0b1d9c View commit details
    Browse the repository at this point in the history

  2. Move to conditional networking 

    We have all the piece in place now to move to conditional networking. So
let's drop the `rd.neednet=1` firstboot karg.

Also don't enable coreos-liveiso-network-kargs.service on FCOS since
it's no longer needed (i.e.  the live ISO will now enable initrd
networking as required given the embedded Ignition config).

On RHCOS, we still need it for now until we move to spec3. Then we can
remove the service and script completely.

Fixes: coreos/fedora-coreos-tracker#443
    @jlebon
    jlebon committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    963a9a8 View commit details
    Browse the repository at this point in the history

  3. 05core/autologin: query journal instead of /run/ignition.json 

    We shouldn't use `/run/ignition.json` to determine whether a user
config was provided since it's implementation details. Instead, use the
new official journal messages that Ignition emits.

This is complicated by the fact that we need to support RHCOS, where the
journal messages haven't been backported. Use the fact that we always
have a base config to key off of whether to use the old behaviour vs the
new one. (More accurately, we'd want to check for
coreos/ignition#1002, but there's no easy way to
do this from the outside. Alternatively we can check the Ignition
version, though that's deeply nested under `/usr/lib/dracut/...`).

Anyway, this should be temporary until RHCOS moves to spec v3.

Closes: coreos#514
    @jlebon
    jlebon committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    613f691 View commit details
    Browse the repository at this point in the history