[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, experimental, updated. debian/0.5.0-1-9-g9377a62

[Guido Guenther]

The following commit has been merged in the experimental branch:
commit 9377a6212cabd097d9be53d7026d182bd772777c
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Dec 5 10:52:01 2008 +0100

    dnsmasq configuration is now easier
    
    Thanks: Simon Kelley for fixing this up so quickly!

diff --git a/debian/README.Debian b/debian/README.Debian
index 13f44c6..f79a6ed 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -38,15 +38,16 @@ To make the default network start automatically use:
 
 In order for things to work this way you need to have the recommended packages
 dnsmasq, bridge-utils and iptables installed. However Debian's default dnsmasq
-configuration conflicts with the way libvirtd wants to invoke it. You have two
-possibilities:
+needs to be adjusted slightly to interoperate with libvirtd:
 
-    * don't start dnsmasq via /etc/init.d/dnsmasq during system startup and let
-      libvirtd handle dnsmasq completely
+cat <<EOF >/etc/dnsmasq.d/00_libvirtd.conf
+# only bind to loopback by default
+interface=lo
+bind-interfaces
+EOF
 
-    * use "interface=lo" and "bind-interfaces" in dnsmasq.conf 
-
-See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=504605 for more information.
+This makes dnsmasq only bind to the loopback interface by default so libvirtd
+can handle the virtual bridges.
 
 Access Control
 ==============
diff --git a/debian/control b/debian/control
index 09c0c1e..364fc30 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, adduser, libvirt0 (>= ${binary:Version}), logrotate
 Enhances: qemu, kvm, xen
 Section: admin
-Recommends: netcat-openbsd, bridge-utils, dnsmasq, iptables, qemu (>= 0.9.1)
+Recommends: netcat-openbsd, bridge-utils, dnsmasq (>= 2.46-1), iptables, qemu (>= 0.9.1)
 Suggests: policykit
 Description: the programs for the libvirt library
  Libvirt is a C toolkit to interact with the virtualization capabilities

-- 
Libvirt debian packaging