[libvirt] [PATCH 19/29] lxc: introduce virtlxcd daemon

[Daniel P. Berrangé]

The virtlxcd daemon will be responsible for providing the lxc API
driver functionality. The lxc driver is still loaded by the main
libvirtd daemon at this stage, so virtlxcd must not be running at
the same time.

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 .gitignore              |  1 +
 libvirt.spec.in         |  1 +
 src/lxc/Makefile.inc.am | 15 +++++++++++++++
 3 files changed, 17 insertions(+)

diff --git a/.gitignore b/.gitignore
index e53f098288..f828835863 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,6 +166,7 @@
 /src/virtlibxld
 /src/virtlockd
 /src/virtlogd
+/src/virtlxcd
 /src/virtnetworkd
 /src/virtnodedevd
 /src/virtnwfilterd
diff --git a/libvirt.spec.in b/libvirt.spec.in
index bb373ea370..68729b8349 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1679,6 +1679,7 @@ exit 0
 
 %if %{with_lxc}
 %files daemon-driver-lxc
+%attr(0755, root, root) %{_sbindir}/virtlxcd
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/
 %config(noreplace) %{_sysconfdir}/libvirt/lxc.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index f27827c1e9..23a53f747b 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -110,6 +110,21 @@ endif WITH_BLKID
 libvirt_driver_lxc_impl_la_LIBADD += $(SECDRIVER_LIBS)
 libvirt_driver_lxc_impl_la_SOURCES = $(LXC_DRIVER_SOURCES)
 
+
+sbin_PROGRAMS += virtlxcd
+
+virtlxcd_SOURCES = $(REMOTE_DAEMON_SOURCES)
+virtlxcd_CFLAGS = \
+       $(REMOTE_DAEMON_CFLAGS) \
+       -DSOCK_NAME="\"virtlxcd-sock\"" \
+       -DSOCK_NAME_RO="\"virtlxcd-sock-ro\"" \
+       -DSOCK_NAME_ADMIN="\"virtlxcd-admin-sock\"" \
+       -DDAEMON_NAME="\"virtlxcd\"" \
+       -DMODULE_NAME="\"lxc\"" \
+       $(NULL)
+virtlxcd_LDFLAGS = $(REMOTE_DAEMON_LDFLAGS)
+virtlxcd_LDADD = $(REMOTE_DAEMON_LDADD)
+
 libexec_PROGRAMS += libvirt_lxc
 
 libvirt_lxc_SOURCES = \
-- 
2.21.0