[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.2-4-2-gedaf33a

Thu Jun 30 17:34:28 UTC 2011

The following commit has been merged in the experimental branch:
commit 2418ebffd756d42551d7e8f56f5d5dc74b82e48a
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue May 10 21:59:25 2011 +0200

    Rediff patches

diff --git a/debian/patches/Autodetect-if-the-remote-nc-command-supports-the-q-o.patch b/debian/patches/Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
index aafef0f..1d7effe 100644
--- a/debian/patches/Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
+++ b/debian/patches/Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
@@ -16,10 +16,10 @@ Bug: https://bugzilla.redhat.com/show_bug.cgi?id=614420
  1 files changed, 40 insertions(+), 7 deletions(-)
 
 diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
-index 71dd68f..d2da193 100644
+index e30780c..e5a2f15 100644
 --- a/src/remote/remote_driver.c
 +++ b/src/remote/remote_driver.c
-@@ -744,7 +744,8 @@ doRemoteOpen (virConnectPtr conn,
+@@ -746,7 +746,8 @@ doRemoteOpen (virConnectPtr conn,
      }
  
      case trans_ssh: {
@@ -29,7 +29,7 @@ index 71dd68f..d2da193 100644
  
          if (username) nr_args += 2; /* For -l username */
          if (no_tty) nr_args += 5;   /* For -T -o BatchMode=yes -e none */
-@@ -777,12 +778,44 @@ doRemoteOpen (virConnectPtr conn,
+@@ -779,12 +780,44 @@ doRemoteOpen (virConnectPtr conn,
              cmd_argv[j++] = strdup ("none");
          }
          cmd_argv[j++] = strdup (priv->hostname);
diff --git a/debian/patches/Debianize-libvirt-guests.patch b/debian/patches/Debianize-libvirt-guests.patch
index a035ba9..5b1a32d 100644
--- a/debian/patches/Debianize-libvirt-guests.patch
+++ b/debian/patches/Debianize-libvirt-guests.patch
@@ -9,7 +9,7 @@ Origin: vendor
  2 files changed, 17 insertions(+), 32 deletions(-)
 
 diff --git a/tools/libvirt-guests.init.sh b/tools/libvirt-guests.init.sh
-index f247e5e..e69570c 100644
+index 30f957a..a3b8a15 100644
 --- a/tools/libvirt-guests.init.sh
 +++ b/tools/libvirt-guests.init.sh
 @@ -4,8 +4,8 @@
@@ -23,7 +23,7 @@ index f247e5e..e69570c 100644
  # Default-Start: 2 3 4 5
  # Default-Stop: 0 1 6
  # Short-Description: suspend/resume libvirt guests on shutdown/boot
-@@ -14,40 +14,26 @@
+@@ -14,41 +14,27 @@
  #              See http://libvirt.org
  ### END INIT INFO
  
@@ -63,6 +63,7 @@ index f247e5e..e69570c 100644
 +ON_BOOT=ignore
 +ON_SHUTDOWN=shutdown
 +SHUTDOWN_TIMEOUT=30
+ START_DELAY=0
  
 -test -f "$sysconfdir"/sysconfig/libvirt-guests &&
 -    . "$sysconfdir"/sysconfig/libvirt-guests
@@ -75,7 +76,7 @@ index f247e5e..e69570c 100644
  
  RETVAL=0
  
-@@ -303,8 +289,7 @@ gueststatus() {
+@@ -310,8 +296,7 @@ gueststatus() {
  
  # rh_status
  # Display current status: whether saved state exists, and whether start
@@ -86,7 +87,7 @@ index f247e5e..e69570c 100644
      if [ -f "$LISTFILE" ]; then
          gettext "stopped, with saved guests"; echo
 diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
-index cd58728..53d89bd 100644
+index 37b258e..b5a7b76 100644
 --- a/tools/libvirt-guests.sysconf
 +++ b/tools/libvirt-guests.sysconf
 @@ -8,7 +8,7 @@
@@ -96,9 +97,9 @@ index cd58728..53d89bd 100644
 -#ON_BOOT=start
 +#ON_BOOT=ignore
  
- # action taken on host shutdown
- # - suspend   all running guests are suspended using virsh managedsave
-@@ -18,7 +18,7 @@
+ # number of seconds to wait between each guest start
+ #START_DELAY=0
+@@ -21,7 +21,7 @@
  #             which just needs a long time to shutdown. When setting
  #             ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a
  #             value suitable for your guests.
diff --git a/debian/patches/Disable-CHECKSUM-rule.patch b/debian/patches/Disable-CHECKSUM-rule.patch
index be200ac..509e582 100644
--- a/debian/patches/Disable-CHECKSUM-rule.patch
+++ b/debian/patches/Disable-CHECKSUM-rule.patch
@@ -10,7 +10,7 @@ Closes: #598330
  1 files changed, 4 insertions(+), 0 deletions(-)
 
 diff --git a/src/util/iptables.c b/src/util/iptables.c
-index 59f5cc7..8c1f727 100644
+index 76d412c..8b22fc8 100644
 --- a/src/util/iptables.c
 +++ b/src/util/iptables.c
 @@ -870,6 +870,7 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx,
diff --git a/debian/patches/fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/fix-Debian-specific-path-to-hvm-loader.patch
index 84323b2..f25fd1c 100644
--- a/debian/patches/fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/fix-Debian-specific-path-to-hvm-loader.patch
@@ -12,7 +12,7 @@ Closes: #517059
  5 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 47355ce..049e2b8 100644
+index 9a5b41d..829a228 100644
 --- a/src/xen/xen_hypervisor.c
 +++ b/src/xen/xen_hypervisor.c
 @@ -2330,7 +2330,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 3888864..802a6aa 100644
--- a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -1,6 +1,7 @@
 From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= <biessmann at corscience.de>
 Date: Thu, 18 Mar 2010 13:05:59 +0100
-Subject: patch qemuMonitorTextGetMigrationStatus to intercept unknown command 'info migrate'
+Subject: patch qemuMonitorTextGetMigrationStatus to intercept unknown command
+ 'info migrate'
 
 Debian package kvm up to version 72 has not implemented the command 'info migrate'.
 This command interface returns help page of info commands and looks like this:
@@ -41,10 +42,10 @@ to savely detect that the command 'info migrate' is not implemented.
  1 files changed, 9 insertions(+), 1 deletions(-)
 
 diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index 75b2995..4a2e4ab 100644
+index 53781c8..0d76a58 100644
 --- a/src/qemu/qemu_monitor_text.c
 +++ b/src/qemu/qemu_monitor_text.c
-@@ -1190,7 +1190,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
+@@ -1191,7 +1191,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
              *total *= 1024;
  
          }
diff --git a/debian/patches/qemu-disable-network.diff.patch b/debian/patches/qemu-disable-network.diff.patch
index 7556dcf..d22bcf3 100644
--- a/debian/patches/qemu-disable-network.diff.patch
+++ b/debian/patches/qemu-disable-network.diff.patch
@@ -8,10 +8,10 @@ Subject: qemu-disable-network.diff
  2 files changed, 0 insertions(+), 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index c3729a6..017ea32 100644
+index 1eaa7d1..a8253d5 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1305,9 +1305,6 @@ if WITH_NETWORK
+@@ -1299,9 +1299,6 @@ if WITH_NETWORK
  	    cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
  	      $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
  	    rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
@@ -22,10 +22,10 @@ index c3729a6..017ea32 100644
  
  uninstall-local::
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 952f50f..bafbeb2 100644
+index c184dd9..f266a5a 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -5746,9 +5746,6 @@ install-data-local:
+@@ -5810,9 +5810,6 @@ install-data-local:
  @WITH_NETWORK_TRUE@	    cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
  @WITH_NETWORK_TRUE@	      $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
  @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
diff --git a/debian/patches/remove-RHism.diff.patch b/debian/patches/remove-RHism.diff.patch
index 64c6384..bf31595 100644
--- a/debian/patches/remove-RHism.diff.patch
+++ b/debian/patches/remove-RHism.diff.patch
@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/tools/virsh.pod b/tools/virsh.pod
-index d332676..ca43498 100644
+index 2a708f6..4357f25 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -97,7 +97,7 @@ Output elapsed time information for each command.
diff --git a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch b/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
index 33dec83..bc46c70 100644
--- a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
+++ b/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
@@ -25,17 +25,17 @@ Otherwise this results in crashes like:
  1 files changed, 3 insertions(+), 0 deletions(-)
 
 diff --git a/tools/virsh.c b/tools/virsh.c
-index 19e3449..e6a0694 100644
+index 5d8b025..f94bd6b 100644
 --- a/tools/virsh.c
 +++ b/tools/virsh.c
-@@ -12072,6 +12072,9 @@ vshInit(vshControl *ctl)
+@@ -12161,6 +12161,9 @@ vshInit(vshControl *ctl)
      /* set up the signals handlers to catch disconnections */
      vshSetupSignals();
  
 +    if (virInitialize() < 0)
-+        return FALSE;
++        return false;
 +
      if (virEventRegisterDefaultImpl() < 0)
-         return FALSE;
+         return false;
  
 -- 

-- 
Libvirt Debian packaging

