Remove lots of duplication in the sysv init file handling, so we can add more init files without modifying so many places. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/Makefile.am | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3e6fb6c244..de2441dd6b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2702,24 +2702,30 @@ uninstall-sysconfig: rm -f $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : -EXTRA_DIST += locking/virtlockd.init.in logging/virtlogd.init.in +SYSVINIT_FILES_IN = \ + locking/virtlockd.init.in \ + logging/virtlogd.init.in \ + $(NULL) + +SYSVINIT_FILES = $(notdir $(SYSVINIT_FILES_IN:%.in=%)) + +EXTRA_DIST += $(SYSVINIT_FILES_IN) if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_RED_HAT -install-init:: virtlockd.init virtlogd.init install-sysconfig +install-init:: $(SYSVINIT_FILES) install-sysconfig $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d - $(INSTALL_SCRIPT) virtlockd.init \ - $(DESTDIR)$(sysconfdir)/rc.d/init.d/virtlockd - $(INSTALL_SCRIPT) virtlogd.init \ - $(DESTDIR)$(sysconfdir)/rc.d/init.d/virtlogd + for f in $(SYSVINIT_FILES:%.init=%) ; \ + do \ + $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/$$f; \ + done uninstall-init:: uninstall-sysconfig - rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/virtlockd - rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/virtlogd + rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(sysconfdir)/rc.d/init.d/%) rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || : -BUILT_SOURCES += virtlockd.init virtlogd.init -DISTCLEANFILES += virtlockd.init virtlogd.init +BUILT_SOURCES += $(SYSVINIT_FILES) +DISTCLEANFILES += $(SYSVINIT_FILES) else ! LIBVIRT_INIT_SCRIPT_RED_HAT install-init:: uninstall-init:: -- 2.14.3

On 02/21/2018 04:35 PM, Daniel P. Berrangé wrote: I guess you wanted to add $(SYSCONF_FILES) to EXTRA_DIST too. Michal

The THREADS.txt describes the way threading worked in libvirtd many many years ago, long before even the RPC code was modularized. Things have evolved significantly since then, so delete this potentially misleading doc. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- daemon/THREADS.txt | 52 ---------------------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 daemon/THREADS.txt diff --git a/daemon/THREADS.txt b/daemon/THREADS.txt deleted file mode 100644 index ae4e9bad90..0000000000 --- a/daemon/THREADS.txt +++ /dev/null @@ -1,52 +0,0 @@ - - Threading in the libvirtd daemon - ================================ - -To allow efficient processing of RPC requests, the libvirtd daemon -makes use of threads. - - - The process leader. This is the initial thread of control - when the daemon starts running. It is responsible for - initializing all the state, and starting the event loop. - Once that's all done, this thread does nothing except - wait for the event loop to quit, thus indicating an orderly - shutdown is required. - - - The event loop. This thread runs the event loop, sitting - in poll() on all monitored file handles, and calculating - and dispatching any timers that may be registered. When - this thread quits, the entire daemon will shutdown. - - - The workers. These 'n' threads all sit around waiting to - process incoming RPC requests. Since RPC requests may take - a long time to complete, with long idle periods, there will - be quite a few workers running. - -The use of threads obviously requires locking to ensure safety when -accessing/changing data structures. - - - the top level lock is on 'struct qemud_server'. This must be - held before acquiring any other lock - - - Each 'struct qemud_client' object has a lock. The server lock - must be held before acquiring it. Once the client lock is acquired - the server lock can (optionally) be dropped. - - - The event loop has its own self-contained lock. You can ignore - this as a caller of virEvent APIs. - - -The server lock is used in conjunction with a condition variable -to pass jobs from the event loop thread to the workers. The main -event loop thread handles I/O from the client socket, and once a -complete RPC message has been read off the wire (and optionally -decrypted), it will be placed on the 'dx' job queue for the -associated client object. The job condition will be signalled and -a worker will wakeup and process it. - -The worker thread must quickly drop its locks on the server and -client to allow the main event loop thread to continue running -with its other work. Critically important, is that now libvirt -API call will ever be made with the server or client locks held. - --- End -- 2.14.3

Having a daemon/ directory makes little sense from a code structure point of view, as 90% of the code that is built into libvirtd already lives in the src/ directory. The virtlockd and virlogd daemons also live entirely in src/{locking,logging} directories. This moves the source code for libvirtd into src/remote/, alongside the client code. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- .gitignore | 2 + daemon/Makefile.am | 125 +-------------------- src/Makefile.am | 93 ++++++++++++++- daemon/libvirtd.c => src/remote/remote_daemon.c | 10 +- daemon/libvirtd.h => src/remote/remote_daemon.h | 10 +- .../remote/remote_daemon_config.c | 10 +- .../remote/remote_daemon_config.h | 10 +- .../remote/remote_daemon_dispatch.c | 16 +-- .../remote/remote_daemon_dispatch.h | 10 +- .../stream.c => src/remote/remote_daemon_stream.c | 8 +- .../stream.h => src/remote/remote_daemon_stream.h | 12 +- 11 files changed, 136 insertions(+), 170 deletions(-) rename daemon/libvirtd.c => src/remote/remote_daemon.c (99%) rename daemon/libvirtd.h => src/remote/remote_daemon.h (93%) rename daemon/libvirtd-config.c => src/remote/remote_daemon_config.c (98%) rename daemon/libvirtd-config.h => src/remote/remote_daemon_config.h (92%) rename daemon/remote.c => src/remote/remote_daemon_dispatch.c (99%) rename daemon/remote.h => src/remote/remote_daemon_dispatch.h (85%) rename daemon/stream.c => src/remote/remote_daemon_stream.c (99%) rename daemon/stream.h => src/remote/remote_daemon_stream.h (85%) diff --git a/.gitignore b/.gitignore index 189116a3d0..415d6d166b 100644 --- a/.gitignore +++ b/.gitignore @@ -139,6 +139,7 @@ /src/libvirt_*helper /src/libvirt_*probes.h /src/libvirt_lxc +/src/libvirtd /src/locking/libxl-lockd.conf /src/locking/libxl-sanlock.conf /src/locking/lock_daemon_dispatch_stubs.h @@ -157,6 +158,7 @@ /src/qemu/test_libvirtd_qemu.aug /src/remote/*_client_bodies.h /src/remote/*_protocol.[ch] +/src/remote/*_stubs.h /src/rpc/virkeepaliveprotocol.[ch] /src/rpc/virnetprotocol.[ch] /src/test_libvirt*.aug diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 42d8f7b3fd..4f682fa740 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -16,37 +16,8 @@ ## License along with this library. If not, see ## <http://www.gnu.org/licenses/>;. -INCLUDES = \ - -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \ - -I$(top_srcdir) \ - -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_builddir)/src -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/util \ - -I$(top_srcdir)/src/conf \ - -I$(top_srcdir)/src/rpc \ - -I$(top_srcdir)/src/remote \ - -I$(top_srcdir)/src/admin \ - -I$(top_srcdir)/src/access \ - $(GETTEXT_CPPFLAGS) - CLEANFILES = -WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS) - -DAEMON_GENERATED = \ - remote_dispatch.h \ - lxc_dispatch.h \ - qemu_dispatch.h \ - $(NULL) - -DAEMON_SOURCES = \ - libvirtd.c libvirtd.h \ - remote.c remote.h \ - stream.c stream.h \ - $(DAEMON_GENERATED) - -LIBVIRTD_CONF_SOURCES = libvirtd-config.c libvirtd-config.h - PODFILES = \ libvirtd.pod \ $(NULL) @@ -57,9 +28,6 @@ MANINFILES = \ DISTCLEANFILES = EXTRA_DIST = \ - remote_dispatch.h \ - lxc_dispatch.h \ - qemu_dispatch.h \ libvirtd.conf \ libvirtd.init.in \ libvirtd.upstart \ @@ -80,59 +48,14 @@ EXTRA_DIST = \ THREADS.txt \ $(PODFILES) \ $(MANINFILES) \ - $(DAEMON_SOURCES) \ - $(LIBVIRTD_CONF_SOURCES) \ $(NULL) BUILT_SOURCES = -REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x -LXC_PROTOCOL = $(top_srcdir)/src/remote/lxc_protocol.x -QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x -ADMIN_PROTOCOL = $(top_srcdir)/src/admin/admin_protocol.x - -remote_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ - --mode=server remote REMOTE $(REMOTE_PROTOCOL) \ - > $(srcdir)/remote_dispatch.h - -lxc_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ - --mode=server lxc LXC $(LXC_PROTOCOL) \ - > $(srcdir)/lxc_dispatch.h - -qemu_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ - --mode=server qemu QEMU $(QEMU_PROTOCOL) \ - > $(srcdir)/qemu_dispatch.h - if WITH_LIBVIRTD -# Build a convenience library, for reuse in tests/libvirtdconftest -noinst_LTLIBRARIES = libvirtd_conf.la -libvirtd_conf_la_SOURCES = $(LIBVIRTD_CONF_SOURCES) -libvirtd_conf_la_CFLAGS = \ - $(LIBXML_CFLAGS) \ - $(XDR_CFLAGS) \ - $(WARN_CFLAGS) $(PIE_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(NULL) -libvirtd_conf_la_LDFLAGS = \ - $(RELRO_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - $(NO_INDIRECT_LDFLAGS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) -libvirtd_conf_la_LIBADD = $(LIBXML_LIBS) - man8_MANS = libvirtd.8 -sbin_PROGRAMS = libvirtd - confdir = $(sysconfdir)/libvirt/ conf_DATA = libvirtd.conf @@ -144,44 +67,6 @@ augeastests_DATA = test_libvirtd.aug CLEANFILES += test_libvirtd.aug -libvirtd_SOURCES = $(DAEMON_SOURCES) - -#-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L -libvirtd_CFLAGS = \ - $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ - $(XDR_CFLAGS) $(DBUS_CFLAGS) $(LIBNL_CFLAGS) \ - $(WARN_CFLAGS) $(PIE_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" - -libvirtd_LDFLAGS = \ - $(RELRO_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - $(NO_INDIRECT_LDFLAGS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) - -libvirtd_LDADD = \ - $(LIBXML_LIBS) \ - $(GNUTLS_LIBS) \ - $(SASL_LIBS) \ - $(DBUS_LIBS) \ - $(LIBNL_LIBS) - -if WITH_DTRACE_PROBES -libvirtd_LDADD += ../src/libvirt_probes.lo -endif WITH_DTRACE_PROBES - -libvirtd_LDADD += \ - libvirtd_conf.la \ - ../src/libvirt_driver_admin.la \ - ../src/libvirt-lxc.la \ - ../src/libvirt-qemu.la \ - $(NULL) - -libvirtd_LDADD += ../src/libvirt.la - if WITH_POLKIT if WITH_POLKIT0 policydir = $(datadir)/PolicyKit/policy @@ -239,9 +124,6 @@ install-data-polkit:: uninstall-data-polkit:: endif ! WITH_POLKIT -remote.c: $(DAEMON_GENERATED) -remote.h: $(DAEMON_GENERATED) - LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \ libvirtd.libxl.logrotate libvirtd.uml.logrotate \ libvirtd.logrotate @@ -414,11 +296,6 @@ check-augeas: test_libvirtd.aug '$(AUGPARSE)' -I $(srcdir) test_libvirtd.aug; \ fi - -# This must be added last, since functions it provides/replaces -# are used by nearly every other library. -libvirtd_LDADD += ../gnulib/lib/libgnu.la $(LIBSOCKET) - else ! WITH_LIBVIRTD install-data-local: install-data-sasl uninstall-local:: uninstall-data-sasl @@ -462,4 +339,4 @@ endif ! WITH_SASL CLEANFILES += $(BUILT_SOURCES) $(man8_MANS) CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda -MAINTAINERCLEANFILES = $(MANINFILES) $(DAEMON_GENERATED) +MAINTAINERCLEANFILES = $(MANINFILES) diff --git a/src/Makefile.am b/src/Makefile.am index bb51be50d7..a1e5fa573e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -85,6 +85,7 @@ lib_LTLIBRARIES = libvirt.la libvirt-qemu.la libvirt-lxc.la moddir = $(libdir)/libvirt/connection-driver mod_LTLIBRARIES = +sbin_PROGRAMS = confdir = $(sysconfdir)/libvirt conf_DATA = libvirt.conf libvirt-admin.conf @@ -537,12 +538,45 @@ remote/qemu_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \ qemu QEMU $(QEMU_PROTOCOL) \ +remote/remote_daemon_dispatch_stubs.h: $(top_srcdir)/src/rpc/gendispatch.pl \ + $(REMOTE_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ + --mode=server remote REMOTE $(REMOTE_PROTOCOL) \ + > $(srcdir)/remote/remote_daemon_dispatch_stubs.h + +remote/remote_daemon_dispatch_lxc_stubs.h: $(top_srcdir)/src/rpc/gendispatch.pl \ + $(LXC_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ + --mode=server lxc LXC $(LXC_PROTOCOL) \ + > $(srcdir)/remote/remote_daemon_dispatch_lxc_stubs.h + +remote/remote_daemon_dispatch_qemu_stubs.h: $(top_srcdir)/src/rpc/gendispatch.pl \ + $(QEMU_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ + --mode=server qemu QEMU $(QEMU_PROTOCOL) \ + > $(srcdir)/remote/remote_daemon_dispatch_qemu_stubs.h + REMOTE_DRIVER_SOURCES = \ remote/remote_driver.c remote/remote_driver.h \ $(REMOTE_DRIVER_GENERATED) +LIBVIRTD_GENERATED = \ + remote/remote_daemon_dispatch_stubs.h \ + remote/remote_daemon_dispatch_lxc_stubs.h \ + remote/remote_daemon_dispatch_qemu_stubs.h \ + $(NULL) + +LIBVIRTD_SOURCES = \ + remote/remote_daemon.c remote/remote_daemon.h \ + remote/remote_daemon_config.c remote/remote_daemon_config.h \ + remote/remote_daemon_dispatch.c remote/remote_daemon_dispatch.h \ + remote/remote_daemon_stream.c remote/remote_daemon_stream.h \ + $(LIBVIRTD_GENERATED) + EXTRA_DIST += $(REMOTE_DRIVER_PROTOCOL) \ - $(REMOTE_DRIVER_GENERATED) + $(REMOTE_DRIVER_GENERATED) \ + $(LIBVIRTD_SOURCES) \ + $(NULL) ADMIN_PROTOCOL = $(srcdir)/admin/admin_protocol.x @@ -1329,6 +1363,55 @@ BUILT_SOURCES += $(REMOTE_DRIVER_GENERATED) endif WITH_REMOTE + +if WITH_LIBVIRTD + +sbin_PROGRAMS += libvirtd + +BUILT_SOURCES += $(LIBVIRTD_GENERATED) + +libvirtd_SOURCES = $(LIBVIRTD_SOURCES) + +libvirtd_CFLAGS = \ + $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ + $(XDR_CFLAGS) $(DBUS_CFLAGS) $(LIBNL_CFLAGS) \ + $(WARN_CFLAGS) $(PIE_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + -I$(srcdir)/rpc \ + $(NULL) + +libvirtd_LDFLAGS = \ + $(RELRO_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ + $(NO_UNDEFINED_LDFLAGS) \ + $(NULL) + +libvirtd_LDADD = \ + $(LIBXML_LIBS) \ + $(GNUTLS_LIBS) \ + $(SASL_LIBS) \ + $(DBUS_LIBS) \ + $(LIBNL_LIBS) \ + $(NULL) + +if WITH_DTRACE_PROBES +libvirtd_LDADD += ../src/libvirt_probes.lo +endif WITH_DTRACE_PROBES + +libvirtd_LDADD += \ + libvirt_driver_admin.la \ + libvirt-lxc.la \ + libvirt-qemu.la \ + libvirt.la \ + ../gnulib/lib/libgnu.la $(LIBSOCKET) \ + $(NULL) + +endif WITH_LIBVIRTD + %protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \ $< $(srcdir)/$(subst $(srcdir)/,,$@) @@ -2620,7 +2703,7 @@ locking/%-lockd.conf: $(srcdir)/locking/lockd.conf cp $< $@ -sbin_PROGRAMS = virtlockd virtlogd +sbin_PROGRAMS += virtlockd virtlogd virtlockd_SOURCES = \ $(LOCK_DAEMON_SOURCES) \ @@ -3368,4 +3451,8 @@ endif WITH_NETWORK CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s DISTCLEANFILES += $(GENERATED_SYM_FILES) -MAINTAINERCLEANFILES += $(REMOTE_DRIVER_GENERATED) $(VIR_NET_RPC_GENERATED) +MAINTAINERCLEANFILES += \ + $(REMOTE_DRIVER_GENERATED) \ + $(LIBVIRTD_GENERATED) \ + $(VIR_NET_RPC_GENERATED) \ + $(NULL) diff --git a/daemon/libvirtd.c b/src/remote/remote_daemon.c similarity index 99% rename from daemon/libvirtd.c rename to src/remote/remote_daemon.c index c5bb12b8ce..a452c72b59 100644 --- a/daemon/libvirtd.c +++ b/src/remote/remote_daemon.c @@ -1,7 +1,7 @@ /* - * libvirtd.c: daemon start of day, guest process & i/o management + * remote_daemon.c: daemon start of day, guest process & i/o management * - * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006-2018 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -40,8 +40,8 @@ #define VIR_FROM_THIS VIR_FROM_QEMU -#include "libvirtd.h" -#include "libvirtd-config.h" +#include "remote_daemon.h" +#include "remote_daemon_config.h" #include "admin/admin_server_dispatch.h" #include "viruuid.h" @@ -50,7 +50,7 @@ #include "virconf.h" #include "virnetlink.h" #include "virnetdaemon.h" -#include "remote.h" +#include "remote_daemon_dispatch.h" #include "virhook.h" #include "viraudit.h" #include "virstring.h" diff --git a/daemon/libvirtd.h b/src/remote/remote_daemon.h similarity index 93% rename from daemon/libvirtd.h rename to src/remote/remote_daemon.h index 082c4bc4df..4467f71da9 100644 --- a/daemon/libvirtd.h +++ b/src/remote/remote_daemon.h @@ -1,7 +1,7 @@ /* - * libvirtd.h: daemon data structure definitions + * remote_daemon.h: daemon data structure definitions * - * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006-2018 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -22,8 +22,8 @@ */ -#ifndef LIBVIRTD_H__ -# define LIBVIRTD_H__ +#ifndef __REMOTE_DAEMON_H__ +# define __REMOTE_DAEMON_H__ # define VIR_ENUM_SENTINELS @@ -85,4 +85,4 @@ extern virNetSASLContextPtr saslCtxt; extern virNetServerProgramPtr remoteProgram; extern virNetServerProgramPtr qemuProgram; -#endif +#endif /* __REMOTE_DAEMON_H__ */ diff --git a/daemon/libvirtd-config.c b/src/remote/remote_daemon_config.c similarity index 98% rename from daemon/libvirtd-config.c rename to src/remote/remote_daemon_config.c index 19b3d168ea..2317115b82 100644 --- a/daemon/libvirtd-config.c +++ b/src/remote/remote_daemon_config.c @@ -1,7 +1,7 @@ /* - * libvirtd-config.c: daemon start of day, guest process & i/o management + * remote_daemon_config.h: libvirtd config file handling * - * Copyright (C) 2006-2012, 2014, 2015 Red Hat, Inc. + * Copyright (C) 2006-2018 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -23,15 +23,15 @@ #include <config.h> -#include "libvirtd-config.h" +#include "remote_daemon_config.h" #include "virconf.h" #include "viralloc.h" #include "virerror.h" #include "virlog.h" #include "rpc/virnetserver.h" #include "configmake.h" -#include "remote/remote_protocol.h" -#include "remote/remote_driver.h" +#include "remote_protocol.h" +#include "remote_driver.h" #include "util/virnetdevopenvswitch.h" #include "virstring.h" #include "virutil.h" diff --git a/daemon/libvirtd-config.h b/src/remote/remote_daemon_config.h similarity index 92% rename from daemon/libvirtd-config.h rename to src/remote/remote_daemon_config.h index d618c96608..49ea80104b 100644 --- a/daemon/libvirtd-config.h +++ b/src/remote/remote_daemon_config.h @@ -1,7 +1,7 @@ /* - * libvirtd-config.h: daemon start of day, guest process & i/o management + * remote_daemon_config.h: libvirtd config file handling * - * Copyright (C) 2006-2012, 2015 Red Hat, Inc. + * Copyright (C) 2006-2018 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -21,8 +21,8 @@ * Author: Daniel P. Berrange <berrange(a)redhat.com&gt; */ -#ifndef __LIBVIRTD_CONFIG_H__ -# define __LIBVIRTD_CONFIG_H__ +#ifndef __REMOTE_DAEMON_CONFIG_H__ +# define __REMOTE_DAEMON_CONFIG_H__ # include "internal.h" @@ -106,4 +106,4 @@ int daemonConfigLoadData(struct daemonConfig *data, const char *filename, const char *filedata); -#endif /* __LIBVIRTD_CONFIG_H__ */ +#endif /* __REMOTE_DAEMON_CONFIG_H__ */ diff --git a/daemon/remote.c b/src/remote/remote_daemon_dispatch.c similarity index 99% rename from daemon/remote.c rename to src/remote/remote_daemon_dispatch.c index 6de4bd00d4..fdb0a362e4 100644 --- a/daemon/remote.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1,7 +1,7 @@ /* - * remote.c: handlers for RPC method calls + * remote_daemon_dispatch.c: handlers for RPC method calls * - * Copyright (C) 2007-2015 Red Hat, Inc. + * Copyright (C) 2007-2018 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,13 +24,13 @@ #include "virerror.h" -#include "remote.h" -#include "libvirtd.h" +#include "remote_daemon_dispatch.h" +#include "remote_daemon.h" #include "libvirt_internal.h" #include "datatypes.h" #include "viralloc.h" #include "virlog.h" -#include "stream.h" +#include "remote_daemon_stream.h" #include "viruuid.h" #include "vircommand.h" #include "intprops.h" @@ -108,9 +108,9 @@ remoteSerializeDomainDiskErrors(virDomainDiskErrorPtr errors, remote_domain_disk_error **ret_errors_val, u_int *ret_errors_len); -#include "remote_dispatch.h" -#include "qemu_dispatch.h" -#include "lxc_dispatch.h" +#include "remote_daemon_dispatch_stubs.h" +#include "remote_daemon_dispatch_qemu_stubs.h" +#include "remote_daemon_dispatch_lxc_stubs.h" /* Prototypes */ diff --git a/daemon/remote.h b/src/remote/remote_daemon_dispatch.h similarity index 85% rename from daemon/remote.h rename to src/remote/remote_daemon_dispatch.h index c1bce9ba2e..015ab977fc 100644 --- a/daemon/remote.h +++ b/src/remote/remote_daemon_dispatch.h @@ -1,7 +1,7 @@ /* - * remote.h: handlers for RPC method calls + * remote_daemon_dispatch.h: handlers for RPC method calls * - * Copyright (C) 2007, 2008, 2009 Red Hat, Inc. + * Copyright (C) 2007-2018 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,8 +21,8 @@ * Author: Daniel P. Berrange <berrange(a)redhat.com&gt; */ -#ifndef __LIBVIRTD_REMOTE_H__ -# define __LIBVIRTD_REMOTE_H__ +#ifndef __REMOTE_DAEMON_DISPATCH_H__ +# define __REMOTE_DAEMON_DISPATCH_H__ # include "remote_protocol.h" # include "rpc/virnetserverprogram.h" @@ -42,4 +42,4 @@ void remoteClientFree(void *data); void *remoteClientNew(virNetServerClientPtr client, void *opaque); -#endif /* __LIBVIRTD_REMOTE_H__ */ +#endif /* __REMOTE_DAEMON_DISPATCH_H__ */ diff --git a/daemon/stream.c b/src/remote/remote_daemon_stream.c similarity index 99% rename from daemon/stream.c rename to src/remote/remote_daemon_stream.c index 49682f1145..4dd3af9e0d 100644 --- a/daemon/stream.c +++ b/src/remote/remote_daemon_stream.c @@ -1,7 +1,7 @@ /* - * stream.c: APIs for managing client streams + * remote_daemon_stream.c: APIs for managing client streams * - * Copyright (C) 2009-2014 Red Hat, Inc. + * Copyright (C) 2009-2018 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,8 +23,8 @@ #include <config.h> -#include "stream.h" -#include "remote.h" +#include "remote_daemon_stream.h" +#include "remote_daemon_dispatch.h" #include "viralloc.h" #include "virlog.h" #include "virnetserverclient.h" diff --git a/daemon/stream.h b/src/remote/remote_daemon_stream.h similarity index 85% rename from daemon/stream.h rename to src/remote/remote_daemon_stream.h index e1f1067595..832e1f7547 100644 --- a/daemon/stream.h +++ b/src/remote/remote_daemon_stream.h @@ -1,7 +1,7 @@ /* - * stream.h: APIs for managing client streams + * remote_daemon_stream.h: APIs for managing client streams * - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009-2018 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,10 +21,10 @@ */ -#ifndef __LIBVIRTD_STREAM_H__ -# define __LIBVIRTD_STREAM_H__ +#ifndef __REMOTE_DAEMON_STREAM_H__ +# define __REMOTE_DAEMON_STREAM_H__ -# include "libvirtd.h" +# include "remote_daemon.h" daemonClientStream * daemonCreateClientStream(virNetServerClientPtr client, @@ -47,4 +47,4 @@ daemonRemoveClientStream(virNetServerClientPtr client, void daemonRemoveAllClientStreams(daemonClientStream *stream); -#endif /* __LIBVIRTD_STREAM_H__ */ +#endif /* __REMOTE_DAEMON_STREAM_H__ */ -- 2.14.3

On Thu, Feb 22, 2018 at 11:24:24AM +0100, Michal Privoznik wrote: I squashed the rule into the next line instead - $(srcdir)/daemon/{lxc,qemu,remote}_dispatch.h \ - $(srcdir)/src/*/{admin_server,log_daemon,lock_daemon}_dispatch_stubs.h \ + $(srcdir)/src/*/{remote_daemon,admin_server,log_daemon,lock_daemon}_dispatch_*stubs.h \ These two client_bodies.h additions are unrelated to this patch. These two are unrelated too Better is to replace $(top_srcdir)/src with $(srcdir) Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

Move the systemd, sysvinit, upstart and sysconfig files into the src/remote/ directory. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- .gitignore | 1 + daemon/Makefile.am | 94 +--------------------- src/Makefile.am | 61 +++++++++++++- {daemon => src/remote}/libvirtd.init.in | 0 {daemon => src/remote}/libvirtd.service.in | 0 {daemon => src/remote}/libvirtd.sysconf | 0 {daemon => src/remote}/libvirtd.upstart | 0 .../remote/virt-guest-shutdown.target.in | 0 8 files changed, 62 insertions(+), 94 deletions(-) rename {daemon => src/remote}/libvirtd.init.in (100%) rename {daemon => src/remote}/libvirtd.service.in (100%) rename {daemon => src/remote}/libvirtd.sysconf (100%) rename {daemon => src/remote}/libvirtd.upstart (100%) rename daemon/virt-guest-shutdown.target => src/remote/virt-guest-shutdown.target.in (100%) diff --git a/.gitignore b/.gitignore index 415d6d166b..7ff6cec2f9 100644 --- a/.gitignore +++ b/.gitignore @@ -169,6 +169,7 @@ /src/virt-aa-helper /src/virtlockd /src/virtlogd +/src/virt-guest-shutdown.target /tests/*.log /tests/*.pid /tests/*.trs diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 012aced9c9..70de285667 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -21,14 +21,9 @@ CLEANFILES = DISTCLEANFILES = EXTRA_DIST = \ libvirtd.conf \ - libvirtd.init.in \ - libvirtd.upstart \ libvirtd.policy.in \ libvirt.rules \ libvirtd.sasl \ - libvirtd.service.in \ - virt-guest-shutdown.target \ - libvirtd.sysconf \ libvirtd.sysctl \ libvirtd.aug \ libvirtd.logrotate.in \ @@ -74,17 +69,13 @@ libvirtd.policy: libvirtd.policy.in $(top_builddir)/config.status mv $@-t $@ BUILT_SOURCES += libvirtd.policy -install-data-local: install-init-redhat install-init-systemd \ - install-init-upstart \ - install-data-sasl install-data-polkit \ +install-data-local: install-data-sasl install-data-polkit \ install-logrotate install-sysctl $(MKDIR_P) $(DESTDIR)$(localstatedir)/log/libvirt \ $(DESTDIR)$(localstatedir)/run/libvirt \ $(DESTDIR)$(localstatedir)/lib/libvirt -uninstall-local:: uninstall-init-redhat uninstall-init-systemd \ - uninstall-init-upstart \ - uninstall-data-sasl uninstall-data-polkit \ +uninstall-local:: uninstall-data-sasl uninstall-data-polkit \ uninstall-logrotate uninstall-sysctl rmdir $(DESTDIR)$(localstatedir)/log/libvirt || : rmdir $(DESTDIR)$(localstatedir)/run/libvirt || : @@ -175,14 +166,6 @@ uninstall-logrotate: rmdir $(DESTDIR)$(localstatedir)/log/libvirt/uml || : rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || : -install-sysconfig: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig - $(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \ - $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd -uninstall-sysconfig: - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd - rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : - 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 @@ -199,79 +182,6 @@ install-sysctl: uninstall-sysctl: endif ! WITH_SYSCTL -if LIBVIRT_INIT_SCRIPT_RED_HAT - -BUILT_SOURCES += libvirtd.init - -install-init-redhat: install-sysconfig libvirtd.init - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d - $(INSTALL_SCRIPT) libvirtd.init \ - $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd - -uninstall-init-redhat: uninstall-sysconfig - rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd - rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || : -else ! LIBVIRT_INIT_SCRIPT_RED_HAT -install-init-redhat: -uninstall-init-redhat: -endif ! LIBVIRT_INIT_SCRIPT_RED_HAT - - -if LIBVIRT_INIT_SCRIPT_UPSTART - -install-init-upstart: install-sysconfig - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d - $(INSTALL_SCRIPT) libvirtd.upstart \ - $(DESTDIR)$(sysconfdir)/event.d/libvirtd - -uninstall-init-upstart: uninstall-sysconfig - rm -f $(DESTDIR)$(sysconfdir)/event.d/libvirtd - rmdir $(DESTDIR)$(sysconfdir)/event.d || : -else ! LIBVIRT_INIT_SCRIPT_UPSTART -install-init-upstart: -uninstall-init-upstart: -endif ! LIBVIRT_INIT_SCRIPT_UPSTART - - -if LIBVIRT_INIT_SCRIPT_SYSTEMD - -SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system -BUILT_SOURCES += libvirtd.service - -install-init-systemd: install-sysconfig libvirtd.service - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_DATA) libvirtd.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service - $(INSTALL_DATA) $(srcdir)/virt-guest-shutdown.target \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virt-guest-shutdown.target - -uninstall-init-systemd: uninstall-sysconfig - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virt-guest-shutdown.target - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : -else ! LIBVIRT_INIT_SCRIPT_SYSTEMD -install-init-systemd: -uninstall-init-systemd: -endif ! LIBVIRT_INIT_SCRIPT_SYSTEMD - -libvirtd.init: libvirtd.init.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - < $< > $@-t && \ - chmod a+x $@-t && \ - mv $@-t $@ - -libvirtd.service: libvirtd.service.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - - check-local: check-augeas AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl diff --git a/src/Makefile.am b/src/Makefile.am index ff22e1f7ea..8988872ce3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2769,6 +2769,7 @@ endif ! WITH_LIBVIRTD SYSCONF_FILES = \ locking/virtlockd.sysconf \ logging/virtlogd.sysconf \ + remote/libvirtd.sysconf \ $(NULL) EXTRA_DIST += \ @@ -2795,6 +2796,7 @@ uninstall-sysconfig: SYSVINIT_FILES_IN = \ locking/virtlockd.init.in \ logging/virtlogd.init.in \ + remote/libvirtd.init.in \ $(NULL) SYSVINIT_FILES = $(notdir $(SYSVINIT_FILES_IN:%.in=%)) @@ -2825,6 +2827,15 @@ install-init:: uninstall-init:: endif ! WITH_LIBVIRTD +libvirtd.init: remote/libvirtd.init.in $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + -e 's|[@]sbindir[@]|$(sbindir)|g' \ + -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ + < $< > $@-t && \ + chmod a+x $@-t && \ + mv $@-t $@ + virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status $(AM_V_GEN)sed \ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ @@ -2911,6 +2922,8 @@ SYSTEMD_UNIT_FILES_IN = \ logging/virtlogd.service.in \ logging/virtlogd.socket.in \ logging/virtlogd-admin.socket.in \ + remote/libvirtd.service.in \ + remote/virt-guest-shutdown.target.in \ $(NULL) EXTRA_DIST += \ @@ -2954,6 +2967,17 @@ install-systemd: uninstall-systemd: endif ! WITH_LIBVIRTD +libvirtd.service: remote/libvirtd.service.in $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + -e 's|[@]sbindir[@]|$(sbindir)|g' \ + -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + +virt-guest-shutdown.target: remote/virt-guest-shutdown.target.in $(top_builddir)/config.status + $(AM_V_GEN)cp $< $@ + virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status $(AM_V_GEN)sed \ -e 's|[@]sbindir[@]|$(sbindir)|g' \ @@ -2993,6 +3017,39 @@ virtlogd-admin.socket: logging/virtlogd-admin.socket.in \ mv $@-t $@ +UPSTART_FILES = \ + remote/libvirtd.upstart \ + $(NULL) + +EXTRA_DIST += $(UPSTART_FILES) + +if WITH_LIBVIRTD +if LIBVIRT_INIT_SCRIPT_UPSTART + +install-upstart: install-sysconfig + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d + for f in $(UPSTART_FILES:%.upstart=%); \ + do \ + tgt=`basename $$f` ; \ + $(INSTALL_SCRIPT) $$f.upstart $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ + done + +uninstall-upstart: uninstall-sysconfig + for f in $(UPSTART_FILES:%.upstart=%); \ + do \ + tgt=`basename $$f` ; \ + rm -f $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ + done + rmdir $(DESTDIR)$(sysconfdir)/event.d || : +else ! LIBVIRT_INIT_SCRIPT_UPSTART +install-upstart: +uninstall-upstart: +endif ! LIBVIRT_INIT_SCRIPT_UPSTART +else ! WITH_LIBVIRTD +install-upstart: +uninstall-upstart: +endif ! WITH_LIBVIRTD + if WITH_SANLOCK lockdriver_LTLIBRARIES += sanlock.la sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES) @@ -3361,7 +3418,7 @@ libvirt_nss_la_LIBADD = \ endif WITH_NSS -install-data-local: install-init install-systemd +install-data-local: install-init install-systemd install-upstart if WITH_LIBVIRTD $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" @@ -3416,7 +3473,7 @@ if WITH_NETWORK $(LN_S) ../default.xml default.xml ) endif WITH_NETWORK -uninstall-local:: uninstall-init uninstall-systemd +uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart if WITH_LIBVIRTD rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||: diff --git a/daemon/libvirtd.init.in b/src/remote/libvirtd.init.in similarity index 100% rename from daemon/libvirtd.init.in rename to src/remote/libvirtd.init.in diff --git a/daemon/libvirtd.service.in b/src/remote/libvirtd.service.in similarity index 100% rename from daemon/libvirtd.service.in rename to src/remote/libvirtd.service.in diff --git a/daemon/libvirtd.sysconf b/src/remote/libvirtd.sysconf similarity index 100% rename from daemon/libvirtd.sysconf rename to src/remote/libvirtd.sysconf diff --git a/daemon/libvirtd.upstart b/src/remote/libvirtd.upstart similarity index 100% rename from daemon/libvirtd.upstart rename to src/remote/libvirtd.upstart diff --git a/daemon/virt-guest-shutdown.target b/src/remote/virt-guest-shutdown.target.in similarity index 100% rename from daemon/virt-guest-shutdown.target rename to src/remote/virt-guest-shutdown.target.in -- 2.14.3

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- daemon/Makefile.am | 26 -------------------------- src/Makefile.am | 24 +++++++++++++++++++++++- {daemon => src/remote}/libvirtd.aug | 0 {daemon => src/remote}/libvirtd.conf | 0 {daemon => src/remote}/test_libvirtd.aug.in | 0 5 files changed, 23 insertions(+), 27 deletions(-) rename {daemon => src/remote}/libvirtd.aug (100%) rename {daemon => src/remote}/libvirtd.conf (100%) rename {daemon => src/remote}/test_libvirtd.aug.in (100%) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 70de285667..8bac9a550b 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -20,18 +20,15 @@ CLEANFILES = DISTCLEANFILES = EXTRA_DIST = \ - libvirtd.conf \ libvirtd.policy.in \ libvirt.rules \ libvirtd.sasl \ libvirtd.sysctl \ - libvirtd.aug \ libvirtd.logrotate.in \ libvirtd.qemu.logrotate.in \ libvirtd.lxc.logrotate.in \ libvirtd.libxl.logrotate.in \ libvirtd.uml.logrotate.in \ - test_libvirtd.aug.in \ THREADS.txt \ $(NULL) @@ -39,17 +36,6 @@ BUILT_SOURCES = if WITH_LIBVIRTD -confdir = $(sysconfdir)/libvirt/ -conf_DATA = libvirtd.conf - -augeasdir = $(datadir)/augeas/lenses -augeas_DATA = libvirtd.aug - -augeastestsdir = $(datadir)/augeas/lenses/tests -augeastests_DATA = test_libvirtd.aug - -CLEANFILES += test_libvirtd.aug - if WITH_POLKIT if WITH_POLKIT0 policydir = $(datadir)/PolicyKit/policy @@ -182,18 +168,6 @@ install-sysctl: uninstall-sysctl: endif ! WITH_SYSCTL -check-local: check-augeas - -AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl - -test_libvirtd.aug: test_libvirtd.aug.in $(srcdir)/libvirtd.conf - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libvirtd.conf $< $@ - -check-augeas: test_libvirtd.aug - $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir) test_libvirtd.aug; \ - fi - else ! WITH_LIBVIRTD install-data-local: install-data-sasl uninstall-local:: uninstall-data-sasl diff --git a/src/Makefile.am b/src/Makefile.am index 8988872ce3..e777fcce09 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1370,6 +1370,14 @@ sbin_PROGRAMS += libvirtd BUILT_SOURCES += $(LIBVIRTD_GENERATED) +augeas_DATA += remote/libvirtd.aug + +augeastest_DATA += test_libvirtd.aug + +conf_DATA += remote/libvirtd.conf + +CLEANFILES += tets_libvirtd.aug + libvirtd_SOURCES = $(LIBVIRTD_SOURCES) libvirtd_CFLAGS = \ @@ -1411,6 +1419,7 @@ libvirtd_LDADD += \ $(NULL) endif WITH_LIBVIRTD +EXTRA_DIST += remote/test_libvirtd.aug.in remote/libvirtd.aug remote/libvirtd.conf %protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \ @@ -2149,11 +2158,12 @@ check-local: check-augeas check-augeas-lockd \ check-augeas-libxl \ check-augeas-bhyve \ + check-augeas-libvirtd \ $(NULL) check-augeas: check-augeas-qemu check-augeas-lxc check-augeas-sanlock \ check-augeas-lockd check-augeas-virtlockd check-augeas-libxl \ - check-augeas-bhyve check-augeas-virtlogd + check-augeas-bhyve check-augeas-virtlogd check-augeas-libvirtd AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl EXTRA_DIST += $(top_srcdir)/build-aux/augeas-gentest.pl @@ -2258,6 +2268,18 @@ check-augeas-virtlogd: test_virtlogd.aug '$(AUGPARSE)' -I $(srcdir)/logging test_virtlogd.aug; \ fi +if WITH_LIBVIRTD +test_libvirtd.aug: remote/test_libvirtd.aug.in \ + remote/libvirtd.conf $(AUG_GENTEST) + $(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf $< $@ + +check-augeas-libvirtd: test_libvirtd.aug + $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ + '$(AUGPARSE)' -I $(srcdir)/remote test_libvirtd.aug; \ + fi +else ! WITH_LIBVIRTD +check-augeas-libvirtd: +endif ! WITH_LIBVIRTD # # Build our version script. This is composed of three parts: # diff --git a/daemon/libvirtd.aug b/src/remote/libvirtd.aug similarity index 100% rename from daemon/libvirtd.aug rename to src/remote/libvirtd.aug diff --git a/daemon/libvirtd.conf b/src/remote/libvirtd.conf similarity index 100% rename from daemon/libvirtd.conf rename to src/remote/libvirtd.conf diff --git a/daemon/test_libvirtd.aug.in b/src/remote/test_libvirtd.aug.in similarity index 100% rename from daemon/test_libvirtd.aug.in rename to src/remote/test_libvirtd.aug.in -- 2.14.3

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- daemon/Makefile.am | 87 ++------------------- src/Makefile.am | 92 ++++++++++++++++++++++- {daemon => src/remote}/libvirtd.policy.in | 0 daemon/libvirt.rules => src/remote/libvirtd.rules | 0 {daemon => src/remote}/libvirtd.sasl | 0 {daemon => src/remote}/libvirtd.sysctl | 0 6 files changed, 94 insertions(+), 85 deletions(-) rename {daemon => src/remote}/libvirtd.policy.in (100%) rename daemon/libvirt.rules => src/remote/libvirtd.rules (100%) rename {daemon => src/remote}/libvirtd.sasl (100%) rename {daemon => src/remote}/libvirtd.sysctl (100%) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 8bac9a550b..ab7faf3e66 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -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 \ @@ -36,59 +32,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 @@ -152,43 +107,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 diff --git a/src/Makefile.am b/src/Makefile.am index e777fcce09..e1a883fa84 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 = \ @@ -1419,7 +1437,15 @@ libvirtd_LDADD += \ $(NULL) endif WITH_LIBVIRTD -EXTRA_DIST += remote/test_libvirtd.aug.in remote/libvirtd.aug remote/libvirtd.conf +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 $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \ @@ -2826,6 +2852,45 @@ 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 @@ -2845,10 +2910,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' \ @@ -3440,7 +3526,7 @@ 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" @@ -3495,7 +3581,7 @@ 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" ||: diff --git a/daemon/libvirtd.policy.in b/src/remote/libvirtd.policy.in similarity index 100% rename from daemon/libvirtd.policy.in rename to src/remote/libvirtd.policy.in diff --git a/daemon/libvirt.rules b/src/remote/libvirtd.rules similarity index 100% rename from daemon/libvirt.rules rename to src/remote/libvirtd.rules diff --git a/daemon/libvirtd.sasl b/src/remote/libvirtd.sasl similarity index 100% rename from daemon/libvirtd.sasl rename to src/remote/libvirtd.sasl diff --git a/daemon/libvirtd.sysctl b/src/remote/libvirtd.sysctl similarity index 100% rename from daemon/libvirtd.sysctl rename to src/remote/libvirtd.sysctl -- 2.14.3

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- Makefile.am | 2 +- configure.ac | 1 - daemon/Makefile.am | 117 --------------------- src/Makefile.am | 45 +++++++- {daemon => src/remote}/libvirtd.libxl.logrotate.in | 0 {daemon => src/remote}/libvirtd.logrotate.in | 0 {daemon => src/remote}/libvirtd.lxc.logrotate.in | 0 {daemon => src/remote}/libvirtd.qemu.logrotate.in | 0 {daemon => src/remote}/libvirtd.uml.logrotate.in | 0 9 files changed, 44 insertions(+), 121 deletions(-) delete mode 100644 daemon/Makefile.am rename {daemon => src/remote}/libvirtd.libxl.logrotate.in (100%) rename {daemon => src/remote}/libvirtd.logrotate.in (100%) rename {daemon => src/remote}/libvirtd.lxc.logrotate.in (100%) rename {daemon => src/remote}/libvirtd.qemu.logrotate.in (100%) rename {daemon => src/remote}/libvirtd.uml.logrotate.in (100%) diff --git a/Makefile.am b/Makefile.am index 5a805b5ee8..0d46c16c22 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ LCOV = lcov GENHTML = genhtml -SUBDIRS = . gnulib/lib include/libvirt src daemon tools docs gnulib/tests \ +SUBDIRS = . gnulib/lib include/libvirt src tools docs gnulib/tests \ tests po examples XZ_OPT ?= -v -T0 diff --git a/configure.ac b/configure.ac index 7997ec5a14..5e720d1b76 100644 --- a/configure.ac +++ b/configure.ac @@ -916,7 +916,6 @@ AC_CONFIG_FILES([\ libvirt.spec mingw-libvirt.spec \ po/Makefile.in \ include/libvirt/libvirt-common.h \ - daemon/Makefile \ examples/Makefile \ tests/Makefile \ tools/Makefile]) diff --git a/daemon/Makefile.am b/daemon/Makefile.am deleted file mode 100644 index ab7faf3e66..0000000000 --- a/daemon/Makefile.am +++ /dev/null @@ -1,117 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 2005-2015 Red Hat, Inc. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>;. - -CLEANFILES = - -DISTCLEANFILES = -EXTRA_DIST = \ - libvirtd.logrotate.in \ - libvirtd.qemu.logrotate.in \ - libvirtd.lxc.logrotate.in \ - libvirtd.libxl.logrotate.in \ - libvirtd.uml.logrotate.in \ - THREADS.txt \ - $(NULL) - -BUILT_SOURCES = - -if WITH_LIBVIRTD - - - -install-data-local: install-logrotate - $(MKDIR_P) $(DESTDIR)$(localstatedir)/log/libvirt \ - $(DESTDIR)$(localstatedir)/run/libvirt \ - $(DESTDIR)$(localstatedir)/lib/libvirt - -uninstall-local:: uninstall-logrotate - rmdir $(DESTDIR)$(localstatedir)/log/libvirt || : - rmdir $(DESTDIR)$(localstatedir)/run/libvirt || : - rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || : - -LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \ - libvirtd.libxl.logrotate libvirtd.uml.logrotate \ - libvirtd.logrotate - -BUILT_SOURCES += $(LOGROTATE_CONFS) - -libvirtd.logrotate: libvirtd.logrotate.in - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -libvirtd.qemu.logrotate: libvirtd.qemu.logrotate.in - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -libvirtd.libxl.logrotate: libvirtd.libxl.logrotate.in - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -libvirtd.uml.logrotate: libvirtd.uml.logrotate.in - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -install-logrotate: $(LOGROTATE_CONFS) - $(MKDIR_P) $(DESTDIR)$(localstatedir)/log/libvirt/qemu/ \ - $(DESTDIR)$(localstatedir)/log/libvirt/lxc/ \ - $(DESTDIR)$(localstatedir)/log/libvirt/uml/ \ - $(DESTDIR)$(sysconfdir)/logrotate.d/ - $(INSTALL_DATA) libvirtd.logrotate \ - $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd - $(INSTALL_DATA) libvirtd.qemu.logrotate \ - $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.qemu - $(INSTALL_DATA) libvirtd.lxc.logrotate \ - $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.lxc - $(INSTALL_DATA) libvirtd.libxl.logrotate \ - $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.libxl - $(INSTALL_DATA) libvirtd.uml.logrotate \ - $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml - -uninstall-logrotate: - rm -f $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd \ - $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.qemu \ - $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.lxc \ - $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.libxl \ - $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml - rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || : - rmdir $(DESTDIR)$(localstatedir)/log/libvirt/lxc || : - rmdir $(DESTDIR)$(localstatedir)/log/libvirt/uml || : - rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || : - -else ! WITH_LIBVIRTD -install-data-local: -uninstall-local:: -endif ! WITH_LIBVIRTD - - -CLEANFILES += $(BUILT_SOURCES) -CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda diff --git a/src/Makefile.am b/src/Makefile.am index e1a883fa84..46329fae74 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2851,8 +2851,41 @@ SYSVINIT_FILES = $(notdir $(SYSVINIT_FILES_IN:%.in=%)) EXTRA_DIST += $(SYSVINIT_FILES_IN) +LOGROTATE_FILES_IN = \ + remote/libvirtd.qemu.logrotate.in \ + remote/libvirtd.lxc.logrotate.in \ + remote/libvirtd.libxl.logrotate.in \ + remote/libvirtd.uml.logrotate.in \ + remote/libvirtd.logrotate.in \ + $(NULL) + +EXTRA_DIST += $(LOGROTATE_FILES_IN) + if WITH_LIBVIRTD +LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%) + +BUILT_SOURCES += $(LOGROTATE_FILES) + +%.logrotate: remote/%.logrotate.in + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + +install-logrotate: $(LOGROTATE_FILES) + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/logrotate.d/ + for f in $(LOGROTATE_FILES) ; \ + do \ + tgt=`echo $$f | sed -e 's/.logrotate//'`; \ + $(INSTALL_DATA) $$f \ + $(DESTDIR)$(sysconfdir)/logrotate.d/$$tgt; \ + done + +uninstall-logrotate: + rm -f $(LOGROTATE_FILES:%.logrotate=$(DESTDIR)$(sysconfdir)/logrotate.d/%) + 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 @@ -2916,6 +2949,8 @@ install-sysctl:: uninstall-sysctl:: install-init:: uninstall-init:: +install-logrotate:: +uninstall-logrotate:: endif ! WITH_LIBVIRTD # This is needed for clients too, so can't wrap in @@ -3526,8 +3561,9 @@ libvirt_nss_la_LIBADD = \ endif WITH_NSS -install-data-local: install-init install-systemd install-upstart install-sysctl install-polkit install-sasl +install-data-local: install-init install-systemd install-upstart install-sysctl install-polkit install-sasl install-logrotate if WITH_LIBVIRTD + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" @@ -3548,6 +3584,7 @@ endif WITH_QEMU if WITH_LXC $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" endif WITH_LXC if WITH_LIBXL $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" @@ -3557,6 +3594,7 @@ endif WITH_LIBXL if WITH_UML $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/uml" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/uml" endif WITH_UML if WITH_XEN $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" @@ -3581,8 +3619,9 @@ if WITH_NETWORK $(LN_S) ../default.xml default.xml ) endif WITH_NETWORK -uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart uninstall-sysctl uninstall-polkit uninstall-sasl +uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart uninstall-sysctl uninstall-polkit uninstall-sasl uninstall-logrotate if WITH_LIBVIRTD + rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||: rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" ||: @@ -3603,6 +3642,7 @@ endif WITH_QEMU if WITH_LXC rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||: rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||: + rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" ||: endif WITH_LXC if WITH_LIBXL rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||: @@ -3612,6 +3652,7 @@ endif WITH_LIBXL if WITH_UML rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" ||: rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/uml" ||: + rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/uml" ||: endif WITH_UML if WITH_XEN rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||: diff --git a/daemon/libvirtd.libxl.logrotate.in b/src/remote/libvirtd.libxl.logrotate.in similarity index 100% rename from daemon/libvirtd.libxl.logrotate.in rename to src/remote/libvirtd.libxl.logrotate.in diff --git a/daemon/libvirtd.logrotate.in b/src/remote/libvirtd.logrotate.in similarity index 100% rename from daemon/libvirtd.logrotate.in rename to src/remote/libvirtd.logrotate.in diff --git a/daemon/libvirtd.lxc.logrotate.in b/src/remote/libvirtd.lxc.logrotate.in similarity index 100% rename from daemon/libvirtd.lxc.logrotate.in rename to src/remote/libvirtd.lxc.logrotate.in diff --git a/daemon/libvirtd.qemu.logrotate.in b/src/remote/libvirtd.qemu.logrotate.in similarity index 100% rename from daemon/libvirtd.qemu.logrotate.in rename to src/remote/libvirtd.qemu.logrotate.in diff --git a/daemon/libvirtd.uml.logrotate.in b/src/remote/libvirtd.uml.logrotate.in similarity index 100% rename from daemon/libvirtd.uml.logrotate.in rename to src/remote/libvirtd.uml.logrotate.in -- 2.14.3

On Thu, Feb 22, 2018 at 11:24:18AM +0100, Michal Privoznik wrote: Hmm, I'll need to tweak .gitignore for earlier patches too in fact. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|