[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.13_rc1-2

[Guido Günther]

The following commit has been merged in the experimental branch:
commit e5b4fbfc4167ce4a4ab4cc39deb72df7d931ae7b
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Jun 28 10:28:57 2012 +0200

    Remove -d from libvirtd_opts
    
    so we can use the same options in the systemd unit file without having
    to fork there too.

diff --git a/debian/libvirt-bin.default b/debian/libvirt-bin.default
index 59ed012..abe4311 100644
--- a/debian/libvirt-bin.default
+++ b/debian/libvirt-bin.default
@@ -5,7 +5,7 @@
 start_libvirtd="yes"
 
 # options passed to libvirtd, add "-l" to listen on tcp
-libvirtd_opts="-d"
+#libvirtd_opts=""
 
 # pass in location of kerberos keytab
 #export KRB5_KTNAME=/etc/libvirt/libvirt.keytab
diff --git a/debian/libvirt-bin.init b/debian/libvirt-bin.init
index b26872c..1e61533 100755
--- a/debian/libvirt-bin.init
+++ b/debian/libvirt-bin.init
@@ -98,7 +98,7 @@ case "$1" in
         	fi
 		rm -f /var/run/libvirtd.pid
 		start-stop-daemon --start --quiet --pidfile $PIDFILE \
-			--exec $DAEMON -- $libvirtd_opts
+			--exec $DAEMON -- -d $libvirtd_opts
 		if running; then
 			log_end_msg 0
 		else

-- 
Libvirt Debian packaging