Provide whippet and dbus-launcher configs #678
Conversation
Provide dbus-launcher and whippet configuration files as subpackages, favoring the dbus-launcher configuration files with a higher epoch number. Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
Provide dbus-launcher and whippet configuration files as subpackages, favoring the dbus-launcher configuration files with a higher epoch number. Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
|
If the configs are the same for both versions of systemd, does it make sense to include them in the |
| # Generated programatically, serde/toml doesn't allow to force the "compact" | ||
| # format on serialization: | ||
| # [user.root] | ||
| # rules = [] |
There was a problem hiding this comment.
I don't understand this comment - did the programmatic generator write it and write out the commented lines? What program was used?
| Provides: %{name}(dbus-config) = 1: | ||
| Provides: %{name}-resolved(dbus-config) = 0: | ||
| Provides: %{name}-networkd(dbus-config) = 0: | ||
| Conflicts: (%{_cross_os}dbus-broker-launcher or %{name}-dbus-launcher-config) |
There was a problem hiding this comment.
nit: this conflict is doing too much work. It also feels like a bug that whippet-config doesn't require whippet and dbus-launcher-config doesn't require dbus-broker-launcher.
You can just ensure that dbus-broker-launcher and whippet - the respective dependencies - conflict with each other, and that these config packages conflict with each other, and that each depends on its launcher.
| Conflicts: (%{_cross_os}dbus-broker-launcher or %{name}-dbus-launcher-config) | |
| Requires: %{_cross_os}whippet | |
| Conflicts: %{name}-dbus-launcher-config |
| %package whippet-config | ||
| Summary: Whippet configuration files | ||
| Requires: %{name} | ||
| Provides: %{name}(dbus-config) = 1: |
There was a problem hiding this comment.
Why is this provided at priority 1 instead of 0?
| Provides: %{name}(dbus-config) = 1: | ||
| Provides: %{name}-resolved(dbus-config) = 1: | ||
| Provides: %{name}-networkd(dbus-config) = 1: |
There was a problem hiding this comment.
Not sure there's much value in these separate capabilities if they're always provided as a group.
| Provides: %{name}(dbus-config) = 1: | |
| Provides: %{name}-resolved(dbus-config) = 1: | |
| Provides: %{name}-networkd(dbus-config) = 1: | |
| Provides: %{name}(dbus-config) = 1: |
| %files dbus-launcher-config | ||
| %{_cross_datadir}/dbus-1/system.d/org.freedesktop.login1.conf | ||
| %{_cross_datadir}/dbus-1/system.d/org.freedesktop.network1.conf | ||
| %{_cross_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf | ||
| %{_cross_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf | ||
| %{_cross_datadir}/dbus-1/system-services | ||
| %{_cross_datadir}/dbus-1/services/org.freedesktop.systemd1.service | ||
|
|
||
| %files whippet-config | ||
| %{_cross_datadir}/whippet/policies.d/org.freedesktop.login1.toml | ||
| %{_cross_datadir}/whippet/policies.d/org.freedesktop.network1.toml | ||
| %{_cross_datadir}/whippet/policies.d/org.freedesktop.systemd1.toml | ||
| %{_cross_datadir}/whippet/policies.d/org.freedesktop.resolve1.toml |
There was a problem hiding this comment.
It would be less work overall to just ship both the XML and TOML configs in the same packages that previously just shipped the XML configs. Then which one is used only depends on which launcher binary gets installed.
| [[default.rules]] | ||
| receive_sender = "org.freedesktop.login1" | ||
| allow = true | ||
|
|
There was a problem hiding this comment.
nit: programmatic generator should not add superfluous empty lines at the end of the file 😀
| # Generated programatically, serde/toml doesn't allow to force the "compact" | ||
| # format on serialization: | ||
| # [user.root] | ||
| # rules = [] |
There was a problem hiding this comment.
This is also missing systemd 257 methods like QueueSignal.
| # Generated programatically, serde/toml doesn't allow to force the "compact" | ||
| # format on serialization: | ||
| # [user.root] | ||
| # rules = [] |
There was a problem hiding this comment.
For systemd 257, this is missing:
ListSessionsExSleepReleaseSessionSetTTY
| [[default.rules]] | ||
| send_destination = "org.freedesktop.login1" | ||
| send_interface = "org.freedesktop.login1.Manager" | ||
| send_member = "GetSession" | ||
| allow = true | ||
|
|
||
| [[default.rules]] | ||
| send_destination = "org.freedesktop.login1" | ||
| send_interface = "org.freedesktop.login1.Manager" | ||
| send_member = "GetSessionByPID" | ||
| allow = true |
There was a problem hiding this comment.
Not a blocker but these rules would be a lot easier to read if we allowed a list of methods per (destination, interface).
[[default.rules]]
send_destination = "org.freedesktop.login1"
send_interface = "org.freedesktop.login1.Manager"
send_members = [
"GetSession",
"GetSessionByPID",
]
allow = true
That would significantly reduce the boilerplate in these files.
Issue number:
Part of #660
Description of changes:
This series provides the
whippetpolicies translated from the configurations provided by systemd forlogind,networkdandresolved.As part of this change, the XML configurations for the
dbus-launcherare now provided in a subpackage, so that the correct configurations are selected depending on the packages available in the variant.Testing done:
In combination with #677 and #661:
aws-devvariant, to includewhippetin the list of installed packages. I confirmed that thewhippetconfiguration files were installed and thedbus-launcherconfiguration files weren'taws-k8s-1.33variant, I confirmed that thedbus-launcherconfiguration files were installed, and thewhippetconfiguration files weren'tTerms 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.