fix(metadata): netplan name fallback for cloudimg clone DHCP recovery#34
Merged
fix(metadata): netplan name fallback for cloudimg clone DHCP recovery#34
Conversation
…covery Append a "zfallback" netplan ethernet block (match by name=e*, dhcp4:true) after the per-NIC MAC-keyed ones. The lexicographic 'z' prefix ensures systemd-networkd processes the MAC-matched 10-netplan-id*.network files first; the name-matched 10-netplan-zfallback.network only kicks in when no idN matches — i.e. on a clone whose new MAC isn't in the snapshot's netplan. DHCP-network cloudimg clones now self-heal at next boot; static-IP cloudimg clones remain unchanged (no DHCP server to fall back to is a network-mode limitation, not a software gap).
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
5-line metadata template addition: append a `zfallback` netplan ethernet block (match by name=`e*`, dhcp4: true) after the per-NIC MAC-keyed `idN` blocks.
systemd-networkd evaluates `.network` files in lexicographic order and the first matching file wins. The lexical `z` prefix ensures the MAC-matched `10-netplan-id*.network` files are always picked first when their MAC matches; the name-matched `10-netplan-zfallback.network` only kicks in when none of the `idN` matches — i.e. on a clone whose new MAC isn't in the snapshot's netplan.
Effect
Verified on testbed (35.240.182.52, cocoon master + this fix)
What was reverted from earlier exploration
I initially also added `r.FirstBooted = false` to FinalizeClone and `dbus` to OCI Dockerfiles, but:
So the final diff is exactly 5 lines.
Test plan