Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
21ea3828
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
21ea3828
编写于
2月 21, 2018
作者:
D
Daniel P. Berrangé
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
daemon: move misc libvirtd policy files to src/remote/
Signed-off-by:
N
Daniel P. Berrangé
<
berrange@redhat.com
>
上级
168bcca9
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
93 addition
and
85 deletion
+93
-85
.gitignore
.gitignore
+1
-1
daemon/Makefile.am
daemon/Makefile.am
+5
-82
src/Makefile.am
src/Makefile.am
+87
-2
src/remote/libvirtd.policy.in
src/remote/libvirtd.policy.in
+0
-0
src/remote/libvirtd.rules
src/remote/libvirtd.rules
+0
-0
src/remote/libvirtd.sasl
src/remote/libvirtd.sasl
+0
-0
src/remote/libvirtd.sysctl
src/remote/libvirtd.sysctl
+0
-0
未找到文件。
.gitignore
浏览文件 @
21ea3828
...
...
@@ -60,7 +60,6 @@
/configure.lineno
/conftest.*
/daemon/libvirtd*.logrotate
/daemon/libvirtd.policy
/docs/aclperms.htmlinc
/docs/apibuild.py.stamp
/docs/devhelp/libvirt.devhelp
...
...
@@ -136,6 +135,7 @@
/src/libvirt_*probes.h
/src/libvirt_lxc
/src/libvirtd
/src/libvirtd.policy
/src/locking/libxl-lockd.conf
/src/locking/libxl-sanlock.conf
/src/locking/lock_daemon_dispatch_stubs.h
...
...
daemon/Makefile.am
浏览文件 @
21ea3828
...
...
@@ -20,10 +20,6 @@ CLEANFILES =
DISTCLEANFILES
=
EXTRA_DIST
=
\
libvirtd.policy.in
\
libvirt.rules
\
libvirtd.sasl
\
libvirtd.sysctl
\
libvirtd.logrotate.in
\
libvirtd.qemu.logrotate.in
\
libvirtd.lxc.logrotate.in
\
...
...
@@ -35,59 +31,18 @@ BUILT_SOURCES =
if
WITH_LIBVIRTD
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
rulesdir
=
$(datadir)
/polkit-1/rules.d
rulesfile
=
libvirt.rules
endif
!
WITH_POLKIT0
endif
WITH_POLKIT
libvirtd.policy
:
libvirtd.policy.in $(top_builddir)/config.status
$(AM_V_GEN)
sed
\
-e
's|[@]authaction[@]|
$(policyauth)
|g'
\
<
$<
>
$@
-t
&&
\
mv
$@
-t
$@
BUILT_SOURCES
+=
libvirtd.policy
install-data-local
:
install-data-sasl install-data-polkit
\
install-logrotate install-sysctl
install-data-local
:
install-logrotate
$(MKDIR_P)
$(DESTDIR)$(localstatedir)
/log/libvirt
\
$(DESTDIR)$(localstatedir)
/run/libvirt
\
$(DESTDIR)$(localstatedir)
/lib/libvirt
uninstall-local
::
uninstall-data-sasl uninstall-data-polkit
\
uninstall-logrotate uninstall-sysctl
uninstall-local
::
uninstall-logrotate
rmdir
$(DESTDIR)$(localstatedir)
/log/libvirt
||
:
rmdir
$(DESTDIR)$(localstatedir)
/run/libvirt
||
:
rmdir
$(DESTDIR)$(localstatedir)
/lib/libvirt
||
:
if
WITH_POLKIT
install-data-polkit
::
$(MKDIR_P)
$(DESTDIR)$(policydir)
$(INSTALL_DATA)
libvirtd.policy
$(DESTDIR)$(policydir)
/org.libvirt.unix.policy
if
!
WITH_POLKIT0
$(MKDIR_P)
$(DESTDIR)$(rulesdir)
$(INSTALL_DATA)
$(srcdir)/$(rulesfile)
$(DESTDIR)$(rulesdir)/50-libvirt.rules
endif
!
WITH_POLKIT0
uninstall-data-polkit
::
rm
-f
$(DESTDIR)$(policydir)
/org.libvirt.unix.policy
rmdir
$(DESTDIR)$(policydir)
||
:
if
!
WITH_POLKIT0
rm
-f
$(DESTDIR)$(rulesdir)/50-libvirt.rules
rmdir $(DESTDIR)$(rulesdir) ||
:
endif
!
WITH_POLKIT0
else
!
WITH_POLKIT
install-data-polkit
::
uninstall-data-polkit
::
endif
!
WITH_POLKIT
LOGROTATE_CONFS
=
libvirtd.qemu.logrotate libvirtd.lxc.logrotate
\
libvirtd.libxl.logrotate libvirtd.uml.logrotate
\
libvirtd.logrotate
...
...
@@ -151,43 +106,11 @@ uninstall-logrotate:
rmdir
$(DESTDIR)$(localstatedir)
/log/libvirt/uml
||
:
rmdir
$(DESTDIR)$(sysconfdir)
/logrotate.d
||
:
if
WITH_SYSCTL
# Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
# /usr/lib/sysctl.d/ even when libdir is /usr/lib64
install-sysctl
:
$(MKDIR_P)
$(DESTDIR)$(prefix)
/lib/sysctl.d
$(INSTALL_DATA)
$(srcdir)
/libvirtd.sysctl
\
$(DESTDIR)$(prefix)
/lib/sysctl.d/60-libvirtd.conf
uninstall-sysctl
:
rm
-f
$(DESTDIR)$(prefix)
/lib/sysctl.d/60-libvirtd.conf
rmdir
$(DESTDIR)$(prefix)
/lib/sysctl.d
||
:
else
!
WITH_SYSCTL
install-sysctl
:
uninstall-sysctl
:
endif
!
WITH_SYSCTL
else
!
WITH_LIBVIRTD
install-data-local
:
install-data-sasl
uninstall-local
::
uninstall-data-sasl
install-data-local
:
uninstall-local
::
endif
!
WITH_LIBVIRTD
# This is needed for clients too, so can't wrap in
# the WITH_LIBVIRTD conditional
if
WITH_SASL
install-data-sasl
:
$(MKDIR_P)
$(DESTDIR)$(sysconfdir)
/sasl2/
$(INSTALL_DATA)
$(srcdir)
/libvirtd.sasl
\
$(DESTDIR)$(sysconfdir)
/sasl2/libvirt.conf
uninstall-data-sasl
:
rm
-f
$(DESTDIR)$(sysconfdir)
/sasl2/libvirt.conf
rmdir
$(DESTDIR)$(sysconfdir)
/sasl2/
||
:
else
!
WITH_SASL
install-data-sasl
:
uninstall-data-sasl
:
endif
!
WITH_SASL
CLEANFILES
+=
$(BUILT_SOURCES)
CLEANFILES
+=
*
.cov
*
.gcov .libs/
*
.gcda .libs/
*
.gcno
*
.gcno
*
.gcda
src/Makefile.am
浏览文件 @
21ea3828
...
...
@@ -1378,6 +1378,24 @@ conf_DATA += remote/libvirtd.conf
CLEANFILES
+=
tets_libvirtd.aug
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
libvirtd.policy
:
remote/libvirtd.policy.in $(top_builddir)/config.status
$(AM_V_GEN)
sed
\
-e
's|[@]authaction[@]|
$(policyauth)
|g'
\
<
$<
>
$@
-t
&&
\
mv
$@
-t
$@
libvirtd_SOURCES
=
$(LIBVIRTD_SOURCES)
libvirtd_CFLAGS
=
\
...
...
@@ -1423,6 +1441,10 @@ EXTRA_DIST += \
remote/test_libvirtd.aug.in
\
remote/libvirtd.aug
\
remote/libvirtd.conf
\
remote/libvirtd.policy.in
\
remote/libvirtd.rules
\
remote/libvirtd.sasl
\
remote/libvirtd.sysctl
\
$(NULL)
%protocol.c
:
%protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl
...
...
@@ -2832,6 +2854,46 @@ SYSVINIT_FILES = $(notdir $(SYSVINIT_FILES_IN:%.in=%))
EXTRA_DIST
+=
$(SYSVINIT_FILES_IN)
if
WITH_LIBVIRTD
if
WITH_SYSCTL
# Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
# /usr/lib/sysctl.d/ even when libdir is /usr/lib64
install-sysctl
:
$(MKDIR_P)
$(DESTDIR)$(prefix)
/lib/sysctl.d
$(INSTALL_DATA)
$(srcdir)
/remote/libvirtd.sysctl
\
$(DESTDIR)$(prefix)
/lib/sysctl.d/60-libvirtd.conf
uninstall-sysctl
:
rm
-f
$(DESTDIR)$(prefix)
/lib/sysctl.d/60-libvirtd.conf
rmdir
$(DESTDIR)$(prefix)
/lib/sysctl.d
||
:
else
!
WITH_SYSCTL
install-sysctl
:
uninstall-sysctl
:
endif
!
WITH_SYSCTL
if
WITH_POLKIT
install-polkit
::
$(MKDIR_P)
$(DESTDIR)$(policydir)
$(INSTALL_DATA)
libvirtd.policy
$(DESTDIR)$(policydir)
/org.libvirt.unix.policy
if
!
WITH_POLKIT0
$(MKDIR_P)
$(DESTDIR)$(datadir)/polkit-1/rules.d
$(INSTALL_DATA)
$(srcdir)/remote/libvirtd.rules
\
$(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules
endif
!
WITH_POLKIT0
uninstall-polkit
::
rm
-f
$(DESTDIR)$(policydir)
/org.libvirt.unix.policy
rmdir
$(DESTDIR)$(policydir)
||
:
if
!
WITH_POLKIT0
rm
-f
$(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules
rmdir $(DESTDIR)$(datadir)/polkit-1/rules.d ||
:
endif
!
WITH_POLKIT0
else
!
WITH_POLKIT
install-polkit
::
uninstall-polkit
::
endif
!
WITH_POLKIT
if
LIBVIRT_INIT_SCRIPT_RED_HAT
install-init
::
$(SYSVINIT_FILES) install-sysconfig
$(MKDIR_P)
$(DESTDIR)$(sysconfdir)
/rc.d/init.d
...
...
@@ -2851,10 +2913,31 @@ install-init::
uninstall-init
::
endif
!
LIBVIRT_INIT_SCRIPT_RED_HAT
else
!
WITH_LIBVIRTD
install-polkit
::
uninstall-polkit
::
install-sysctl
::
uninstall-sysctl
::
install-init
::
uninstall-init
::
endif
!
WITH_LIBVIRTD
# This is needed for clients too, so can't wrap in
# the WITH_LIBVIRTD conditional
if
WITH_SASL
install-sasl
:
$(MKDIR_P)
$(DESTDIR)$(sysconfdir)
/sasl2/
$(INSTALL_DATA)
$(srcdir)
/remote/libvirtd.sasl
\
$(DESTDIR)$(sysconfdir)
/sasl2/libvirt.conf
uninstall-sasl
:
rm
-f
$(DESTDIR)$(sysconfdir)
/sasl2/libvirt.conf
rmdir
$(DESTDIR)$(sysconfdir)
/sasl2/
||
:
else
!
WITH_SASL
install-sasl
:
uninstall-sasl
:
endif
!
WITH_SASL
libvirtd.init
:
remote/libvirtd.init.in $(top_builddir)/config.status
$(AM_V_GEN)
sed
\
-e
's|[@]localstatedir[@]|
$(localstatedir)
|g'
\
...
...
@@ -3447,7 +3530,8 @@ libvirt_nss_la_LIBADD = \
endif
WITH_NSS
install-data-local
:
install-init install-systemd install-upstart
install-data-local
:
install-init install-systemd install-upstart
\
install-sysctl install-polkit install-sasl
if
WITH_LIBVIRTD
$(MKDIR_P)
"$(DESTDIR)$(localstatedir)/lib/libvirt/lockd"
$(MKDIR_P)
"$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files"
...
...
@@ -3502,7 +3586,8 @@ if WITH_NETWORK
$(LN_S)
../default.xml
default.xml
)
endif
WITH_NETWORK
uninstall-local
::
uninstall-init uninstall-systemd uninstall-upstart
uninstall-local
::
uninstall-init uninstall-systemd uninstall-upstart
\
uninstall-sysctl uninstall-polkit uninstall-sasl
if
WITH_LIBVIRTD
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||
:
rmdir
"
$(DESTDIR)$(localstatedir)
/lib/libvirt/lockd"
||
:
...
...
daemon
/libvirtd.policy.in
→
src/remote
/libvirtd.policy.in
浏览文件 @
21ea3828
文件已移动
daemon/libvirt
.rules
→
src/remote/libvirtd
.rules
浏览文件 @
21ea3828
文件已移动
daemon
/libvirtd.sasl
→
src/remote
/libvirtd.sasl
浏览文件 @
21ea3828
文件已移动
daemon
/libvirtd.sysctl
→
src/remote
/libvirtd.sysctl
浏览文件 @
21ea3828
文件已移动
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录