mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 05:35:25 +00:00
Do not generate polkit rules file
This essentially reverts commit <e1019e9>, which added an extra step for generating the policy file. Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
af41cf5957
commit
ab20f5059c
1
.gitignore
vendored
1
.gitignore
vendored
@ -135,7 +135,6 @@
|
||||
/src/libvirt_lxc
|
||||
/src/libvirtd
|
||||
/src/libvirtd*.logrotate
|
||||
/src/libvirtd.policy
|
||||
/src/locking/libxl-lockd.conf
|
||||
/src/locking/libxl-sanlock.conf
|
||||
/src/locking/lock_daemon_dispatch_stubs.h
|
||||
|
@ -75,7 +75,7 @@ EXTRA_DIST += \
|
||||
remote/test_libvirtd.aug.in \
|
||||
remote/libvirtd.aug \
|
||||
remote/libvirtd.conf \
|
||||
remote/libvirtd.policy.in \
|
||||
remote/libvirtd.policy \
|
||||
remote/libvirtd.rules \
|
||||
remote/libvirtd.sasl \
|
||||
remote/libvirtd.sysctl \
|
||||
@ -121,12 +121,8 @@ CLEANFILES += test_libvirtd.aug
|
||||
|
||||
if WITH_POLKIT
|
||||
policydir = $(datadir)/polkit-1/actions
|
||||
policyauth = auth_admin_keep
|
||||
endif WITH_POLKIT
|
||||
|
||||
BUILT_SOURCES += libvirtd.policy
|
||||
CLEANFILES += libvirtd.policy
|
||||
|
||||
man8_MANS += libvirtd.8
|
||||
|
||||
libvirtd_SOURCES = $(LIBVIRTD_SOURCES)
|
||||
@ -213,7 +209,8 @@ endif ! WITH_SYSCTL
|
||||
if WITH_POLKIT
|
||||
install-polkit::
|
||||
$(MKDIR_P) $(DESTDIR)$(policydir)
|
||||
$(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
|
||||
$(INSTALL_DATA) $(srcdir)/remote/libvirtd.policy \
|
||||
$(DESTDIR)$(policydir)/org.libvirt.unix.policy
|
||||
$(MKDIR_P) $(DESTDIR)$(datadir)/polkit-1/rules.d
|
||||
$(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \
|
||||
$(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules
|
||||
@ -258,12 +255,6 @@ install-sasl:
|
||||
uninstall-sasl:
|
||||
endif ! WITH_SASL
|
||||
|
||||
libvirtd.policy: remote/libvirtd.policy.in $(top_builddir)/config.status
|
||||
$(AM_V_GEN) sed \
|
||||
-e 's|[@]authaction[@]|$(policyauth)|g' \
|
||||
< $< > $@-t && \
|
||||
mv $@-t $@
|
||||
|
||||
libvirtd.init: remote/libvirtd.init.in $(top_builddir)/config.status
|
||||
$(AM_V_GEN)sed \
|
||||
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
|
||||
|
@ -43,9 +43,9 @@ License along with this library. If not, see
|
||||
<defaults>
|
||||
<!-- Any program can use libvirt in read/write mode if they
|
||||
provide the root password -->
|
||||
<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>
|
||||
</defaults>
|
||||
</action>
|
||||
</policyconfig>
|
Loading…
Reference in New Issue
Block a user