WIP: Run NM via systemd unit, don't depend on ip=dhcp kargs #321
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| @@KERNEL-ARGS@@ ignition.firstboot ignition.platform.id=metal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| [Unit] | ||
| Description=Network Manager (CoreOS initrd) | ||
| Wants=network.target | ||
| After=network-pre.target dbus.service | ||
| Before=network.target network.service | ||
|
|
||
| [Service] | ||
| Type=oneshot | ||
| RemainAfterExit=yes | ||
| ExecStart=/usr/libexec/nm-initrd-generator rd.neednet=1 ip=dhcp,dhcp6 | ||
| ExecStart=/usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon | ||
| CapabilityBoundingSet=CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_MODULE CAP_AUDIT_WRITE CAP_KILL CAP_SYS_CHROOT | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| #!/bin/bash | ||
| # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- | ||
| # ex: ts=8 sw=4 sts=4 et filetype=sh | ||
|
|
||
| depends() { | ||
| echo ignition network-manager | ||
| } | ||
|
|
||
| install_and_enable_unit() { | ||
| unit="$1"; shift | ||
| target="$1"; shift | ||
| inst_simple "$moddir/$unit" "$systemdsystemunitdir/$unit" | ||
| mkdir -p "$initdir/$systemdsystemunitdir/$target.requires" | ||
| ln_r "../$unit" "$systemdsystemunitdir/$target.requires/$unit" | ||
| } | ||
|
|
||
| install() { | ||
| # We're forcibly overriding NM to be run as a service | ||
| install_and_enable_unit coreos-NetworkManager.service network-online.target | ||
|
There was a problem hiding this comment. This should be There was a problem hiding this comment. Mmm...debatable. See https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/ |
||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this is going to work. I fear this is going to miss:
/etc/cmdline.d.(e.g. the ones forwarded from vmware guestinfo)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, we probably need to make this an
ExecStartPre=that looks at/proc/cmdlineand defers to that if any relevant arguments exist.This only exists in coreos/afterburn#379 right?
But hmm...either way, we should order
After=dracut-cmdline.serviceand parse.../tmp/networking_optsit looks like?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, the vmware guestinfo bits specifically are only in a not-yet-merged PR, but generally I think the
cmdline.dprimitive is a useful one to keep.