[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.9.0-1

[Guido Günther]

The following commit has been merged in the master branch:
commit 0a63618f1ca59d5c696d4cc45465d1c48eb039a5
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Apr 16 13:36:54 2011 +0200

    New patch Disable-daemon-start-test.patch
    
    Disable daemon start test

diff --git a/debian/patches/Disable-daemon-start-test.patch b/debian/patches/Disable-daemon-start-test.patch
new file mode 100644
index 0000000..bcc4bd3
--- /dev/null
+++ b/debian/patches/Disable-daemon-start-test.patch
@@ -0,0 +1,33 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sat, 16 Apr 2011 13:36:08 +0200
+Subject: Disable daemon start test
+
+since we don't have sys. This is a workaround only.
+---
+ tests/daemon-conf |   12 ------------
+ 1 files changed, 0 insertions(+), 12 deletions(-)
+
+diff --git a/tests/daemon-conf b/tests/daemon-conf
+index 6aa3269..4dac92e 100755
+--- a/tests/daemon-conf
++++ b/tests/daemon-conf
+@@ -97,18 +97,6 @@ fi
+ sed 's/^\(host_uuid =.*\)0"$/\11"/; s/^\(audit_level =.*\)2$/\1 1/' tmp.conf > k
+ mv k tmp.conf
+ 
+-$abs_top_builddir/daemon/libvirtd --pid-file=pid-file --config=tmp.conf \
+-    > log 2>&1 & pid=$!
+-sleep $sleep_secs
+-kill $pid
+-
+-RET=0
+-# Expect an orderly shut-down and successful exit.
+-wait $pid || RET=1
+-
+-test_result $i "valid config file (sleeping $sleep_secs seconds)" $RET
+-test $RET = 0 || fail=1
+-
+ test_final $i $fail
+ 
+ # "cat log" would print this for non-root:
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index e93a980..a06759e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
 Disable-CHECKSUM-rule.patch
 Debianize-libvirt-guests.patch
 virsh-Initialize-library-before-calling-virResetLast.patch
+Disable-daemon-start-test.patch

-- 
Libvirt Debian packaging