-
Notifications
You must be signed in to change notification settings - Fork 519
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.
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
Enable systemd-networkd
development via build flag
#2741
Merged
Merged
Conversation
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
bcressey
reviewed
Jan 18, 2023
packages/systemd/9012-adjust-default-networkd-dbus-policy.patch
Outdated
Show resolved
Hide resolved
arnaldo2792
reviewed
Jan 19, 2023
This change adds a subpackage for `systemd-networkd` and its associated files, explicitly excluding them from the broader `systemd` package.
This change adds an additional build flag `systemd-networkd` that can be used to enable the `systemd-networkd` backend in place of `wicked`. The flag is translated into a bcond which can be used in RPM spec files.
zmrow
force-pushed
the
networkd-build-flag
branch
from
January 19, 2023 22:57
d73dfdc
to
9f20bce
Compare
bcressey
approved these changes
Jan 20, 2023
yeazelm
approved these changes
Jan 20, 2023
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.
LGTM!
This change conditionally builds the `wicked` or `systemd-networkd` network backend into the variant based on the presence of the `systemd-networkd` build flag. This conditional logic is now located in the os package. The os package is has been changed to be sensitive to the `systemd-networkd` image feature so it will be rebuilt if the feature is added/removed. `wicked` has been removed from the release package to prevent it from always being built and included.
zmrow
force-pushed
the
networkd-build-flag
branch
from
January 20, 2023 16:45
9f20bce
to
1df4e38
Compare
^ Adds the missing comment requested by @arnaldo2792 |
arnaldo2792
approved these changes
Jan 20, 2023
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.
🎉
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.
Issue number:
Related to: #2449
Description of changes:
This initial set of commits enables development for the project's transition to
systemd-networkd
, allowing developers to conditionally includesystemd-networkd
(and excludewicked
) in any variant.A new subpackage
networkd
has been added to thesystemd
package and contains all of the relevant files, excluding them from the broadersystemd
build. At least for now, it appears we can continue to avoidpolkit
so those files continue to be excluded.A new build flag
systemd-networkd
has been added, which can be tacked on to theimage-features
of a variant to disable wicked and enablesystemd-networkd
. Under the hood, the flag conditionally buildssystemd-networkd
in theos
package. Sample variant config snippet:Testing done:
aws-dev
andaws-k8s-1.22
variant without the build flag to ensure it works as expected and onlywicked
artifacts are includedaws-dev
variant with the build flag enabled to ensure theos
package gets rebuilt andsystemd-networkd
is added instead ofwicked
. I added an early dependency onconsole-getty.service
to thepreconfigured.target
since I knew early services would be broken but I still wanted to be able to poke around and verify the above.🎉
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.