[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/experimental] 3 commits: Revert "d/libvirt-daemon-system.install: ship libxl-sanlock.conf"

[Guido Günther]

Guido Günther pushed to branch debian/experimental at Libvirt Packaging Team / libvirt


Commits:
39b658c5 by Christian Ehrhardt at 2019-06-11T08:06:04Z
Revert "d/libvirt-daemon-system.install: ship libxl-sanlock.conf"

This reverts commit f19acf6b00fe26fa68e0f62e321be0cbd61dadbf.
This depends on Xen being enabled, needs to go to d/rules

- - - - -
ce463609 by Christian Ehrhardt at 2019-06-11T08:06:13Z
d/rules: install libxl-sanlock.conf dependent on xen being enabled

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
d771e96d by Guido Günther at 2019-06-11T08:21:47Z
Merge branch 'fix-libxl-sanlock-debian' into 'debian/experimental'

Fix libxl sanlock debian

See merge request libvirt-team/libvirt!28
- - - - -


2 changed files:

- debian/libvirt-daemon-system.install
- debian/rules


Changes:

=====================================
debian/libvirt-daemon-system.install
=====================================
@@ -6,4 +6,3 @@ etc/libvirt/virtlogd.conf
 etc/sasl2/*
 usr/share/polkit-1
 usr/lib/firewalld/zones/libvirt.xml
-etc/libvirt/libxl-sanlock.conf


=====================================
debian/rules
=====================================
@@ -210,6 +210,7 @@ endif
 ifeq ($(XEN_ENABLED), 1)
 	dh_install -p libvirt-daemon-system etc/libvirt/libxl.conf
 	dh_install -p libvirt-daemon-system etc/libvirt/libxl-lockd.conf
+	dh_install -p libvirt-daemon-system etc/libvirt/libxl-sanlock.conf
 endif
 
 	set -e; for l in $(LOGROTATE); do \



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/compare/2e222a2b0d4f5446a474c6faf70849507ddd5a4d...d771e96d0c313e50e75f888b82a06e1ade5fd9f2

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/compare/2e222a2b0d4f5446a474c6faf70849507ddd5a4d...d771e96d0c313e50e75f888b82a06e1ade5fd9f2
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20190611/d3dd8753/attachment.html>