overlay: add 40coreos-network dracut module #89
Conversation
yuqi-zhang
force-pushed
the
add-remove-initramfs-network-script
branch
from
479b58d
to
afa6203
Compare
|
so for RHCOS we have this in the ignition-dracut repo and for FCOS we have it here? should we merge those two strategies in the future? |
Once RHCOS rebases to spec3, this will have to happen (i.e. it'll have to be part of the RHCOS |
| Conflicts=initrd-switch-root.target umount.target | ||
| Before=initrd-switch-root.target | ||
|
|
||
| # Make sure if ExecStart= fails, the boot fails |
yuqi-zhang
force-pushed
the
add-remove-initramfs-network-script
branch
from
afa6203
to
7b19356
Compare
|
Fixed up, thanks!
And I would vote to do this after GA at the earliest, but I agree we should match the two eventually. |
| set -euo pipefail | ||
|
|
||
| # Clean up the interfaces set up in the initramfs | ||
| # This mimics the behaviour of dracut's ifdown() in net-lib.sh |
There was a problem hiding this comment.
hmm - if it mimics that code then why not source it and run it directly rather than implement our own?
There was a problem hiding this comment.
Sorry, this is the original function: https://github.com/dracutdevs/dracut/blob/master/modules.d/40network/net-lib.sh#L97
It does some things we don't necessarily need/want, and I recall having issues running it directly, so I opted to take a snippet of it.
There was a problem hiding this comment.
If you want I can look into making that work instead? I didn't think it was necessary. We are likely going to try to move for NM managed dracut networking. See: https://github.com/dracutdevs/dracut/tree/master/modules.d/35network-manager
There was a problem hiding this comment.
ehh - if it's temporary then it's fine IMHO - should we mention that NM thing in a comment?
|
For FCOS, at least, this is a temporary fix until we can move away from dracut's networking scripts. In the meantime, I'm fine with merging it. |
Add coreos-teardown-initramfs-network.service to run after ignition has finished using initramfs networking, so NetworkManager properly brings up ignition-configured networking in the real root. Otherwise the initramfs network persists into the real root. Signed-off-by: Yu Qi Zhang <[email protected]>
yuqi-zhang
force-pushed
the
add-remove-initramfs-network-script
branch
from
7b19356
to
474e6e3
Compare
|
Rebased and added comment, feel free to merge |
Jenkinsfile.cloud: Write AMI json to images directory
Add coreos-teardown-initramfs-network.service to run after ignition
has finished using initramfs networking, so NetworkManager properly
brings up ignition-configured networking in the real root. Otherwise
the initramfs network persists into the real root.
Note: I'm not sure what the correct priority is, so I made it 40 to match other services.
It shouldn't really matter since this service actually runs during
ExecStopandbefore
Before=initrd-switch-root.target.