On Wed, 2018-03-07 at 10:29 +0100, Ján Tomko wrote:
Policy-Kit has been replaced by polkit (referred to as POLKIT0
and POLKIT1 in our Makefiles).
... referred to, respectively, as ...
[...]
if WITH_POLKIT
-if WITH_POLKIT0
-policydir = $(datadir)/PolicyKit/policy
-policyauth = auth_admin_keep_session
-else ! WITH_POLKIT0
policydir = $(datadir)/polkit-1/actions
-policyauth = auth_admin_keep
-endif ! WITH_POLKIT0
endif WITH_POLKIT
-BUILT_SOURCES += libvirtd.policy
-CLEANFILES += libvirtd.policy
[...]
-libvirtd.policy: remote/libvirtd.policy.in
$(top_builddir)/config.status
- $(AM_V_GEN) sed \
- -e 's|[@]authaction[@]|$(policyauth)|g' \
- < $< > $@-t && \
- mv $@-t $@
[...]
- <allow_any>@authaction@</allow_any>
- <allow_inactive>@authaction@</allow_inactive>
- <allow_active>@authaction@</allow_active>
+ <allow_any>auth_admin_keep</allow_any>
+ <allow_inactive>auth_admin_keep</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
The bit about generating the .policy file dynamically is clearly
not needed anymore after you've removed support for the second
polkit version; however, that machinery can just as well be
removed in a follow-up commit, so I'd like you to do that.
The rest looks good, so
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization