[Kimchi-devel] [Kimchi] Issue #816: kimchi.conf isn't pointing to libvirt service on ubuntu 15.10

Ramon Medeiros ramonn at linux.vnet.ibm.com
Fri Jan 8 14:36:39 UTC 2016


Ubuntu uses libvirt service as libvirt-bin, not libvirtd.

Signed-off-by: Ramon Medeiros <ramonn at linux.vnet.ibm.com>
---
 Makefile.am                    | 6 +++++-
 contrib/kimchid.service.ubuntu | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 contrib/kimchid.service.ubuntu

diff --git a/Makefile.am b/Makefile.am
index 1c5af68..b8e952e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -139,7 +139,11 @@ ChangeLog:
 install-data-local:
 	@if test -d "$(systemdsystemunitdir)" ; then \
 		mkdir -p $(DESTDIR)/etc/systemd/system/wokd.service.d; \
-		$(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/etc/systemd/system/wokd.service.d/kimchi.conf; \
+		if test -f /etc/debian_version; then \
+			$(INSTALL_DATA) contrib/kimchid.service.ubuntu $(DESTDIR)/etc/systemd/system/wokd.service.d/kimchi.conf; \
+		else \
+			$(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/etc/systemd/system/wokd.service.d/kimchi.conf; \
+		fi; \
 	fi; \
 	$(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/kimchi/
 	$(MKDIR_P) $(DESTDIR)$(kimchidir)
diff --git a/contrib/kimchid.service.ubuntu b/contrib/kimchid.service.ubuntu
new file mode 100644
index 0000000..1c7d63f
--- /dev/null
+++ b/contrib/kimchid.service.ubuntu
@@ -0,0 +1,7 @@
+[Unit]
+Requires=libvirt-bin.service wokd.service
+After=libvirt-bin.service wokd.service
+
+[Service]
+Nice=0
+PrivateTmp=yes
-- 
2.1.0




More information about the Kimchi-devel mailing list