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

[Guido Günther]

The following commit has been merged in the master branch:
commit bae2f7bb1eed5f1d0246dd62ae878f19f2848680
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Mar 1 16:53:45 2013 +0100

    Hook log the exit status of the hook not 256
    
    Closes: #701570

diff --git a/debian/patches/Hook-log-the-exit-status-of-the-hook-not-256.patch b/debian/patches/Hook-log-the-exit-status-of-the-hook-not-256.patch
new file mode 100644
index 0000000..2540b7d
--- /dev/null
+++ b/debian/patches/Hook-log-the-exit-status-of-the-hook-not-256.patch
@@ -0,0 +1,30 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sun, 24 Feb 2013 19:43:04 +0100
+Subject: Hook log the exit status of the hook not 256
+
+Adjust the docs accordingly. See http://bugs.debian.org/701570.
+---
+ docs/hooks.html.in |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/docs/hooks.html.in b/docs/hooks.html.in
+index 5f9963d..1a2fae1 100644
+--- a/docs/hooks.html.in
++++ b/docs/hooks.html.in
+@@ -239,13 +239,14 @@
+     <p>If a hook script returns with an exit code of 0, the libvirt daemon
+        regards this as successful and performs no logging of it.</p>
+     <p>However, if a hook script returns with a non zero exit code, the libvirt
+-       daemon regards this as a failure, logs it with return code 256, and
++       daemon regards this as a failure, logs it's return code, and
+        additionally logs anything on stderr the hook script returns.</p>
+     <p>For example, a hook script might use this code to indicate failure,
+        and send a text string to stderr:</p>
+     <pre>echo "Could not find required XYZZY" >&2
+ exit 1</pre>
+     <p>The resulting entry in the libvirt log will appear as:</p>
+-    <pre>20:02:40.297: error : virHookCall:416 : Hook script execution failed: Hook script /etc/libvirt/hooks/qemu qemu failed with error code 256:Could not find required XYZZY</pre>
++    <pre>20:02:40.297: error : virHookCall:285 : Hook script execution failed: internal error Child process (LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++                       HOME=/root USER=root LOGNAME=root /etc/libvirt/hooks/qemu qemu prepare begin -) unexpected exit status 1: Could not find required XYZZY</pre>
+   </body>
+ </html>
diff --git a/debian/patches/series b/debian/patches/series
index 6148614..51c9b5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ Don-t-fail-if-we-can-t-setup-avahi.patch
 Reduce-udevadm-settle-timeout-to-10-seconds.patch
 debian/Debianize-systemd-service-files.patch
 Allow-xen-toolstack-to-find-it-s-binaries.patch
+Hook-log-the-exit-status-of-the-hook-not-256.patch

-- 
Libvirt Debian packaging