Starting with Ubuntu 16.10, libvirtd is available, so use it to keep the same standard across all distributions. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com&gt; --- Makefile.am | 2 +- contrib/kimchid.service.debian | 8 ++++++++ contrib/kimchid.service.ubuntu | 8 -------- 3 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 contrib/kimchid.service.debian delete mode 100644 contrib/kimchid.service.ubuntu diff --git a/Makefile.am b/Makefile.am index a4fa712..68cdac0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -161,7 +161,7 @@ install-data-local: @if test -d "$(systemdsystemunitdir)" ; then \ mkdir -p $(DESTDIR)/etc/systemd/system/wokd.service.d; \ if test -f /etc/debian_version; then \ - $(INSTALL_DATA) contrib/kimchid.service.ubuntu $(DESTDIR)/etc/systemd/system/wokd.service.d/kimchi.conf; \ + $(INSTALL_DATA) contrib/kimchid.service.debian $(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; \ diff --git a/contrib/kimchid.service.debian b/contrib/kimchid.service.debian new file mode 100644 index 0000000..87a5866 --- /dev/null +++ b/contrib/kimchid.service.debian @@ -0,0 +1,8 @@ +[Unit] +Requires=wokd.service +Wants=libvirtd.service +After=libvirtd.service wokd.service + +[Service] +Nice=0 +PrivateTmp=no diff --git a/contrib/kimchid.service.ubuntu b/contrib/kimchid.service.ubuntu deleted file mode 100644 index e52db66..0000000 --- a/contrib/kimchid.service.ubuntu +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Requires=wokd.service -Wants=libvirt-bin.service -After=libvirt-bin.service wokd.service - -[Service] -Nice=0 -PrivateTmp=no -- 2.7.4