[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.8.6-1-12-g18bb43a
Laurent Léonard
laurent at open-minds.org
Tue Jan 4 11:18:44 UTC 2011
The following commit has been merged in the experimental branch:
commit 1290aa0fcf528342e013ceb516b4f4d029ffc162
Author: Laurent Léonard <laurent at open-minds.org>
Date: Tue Jan 4 12:04:52 2011 +0100
Drop patches
0008-syntax-error-Bad-fd-number-when-stopping-libvirt-gue.patch - fixed upstream http://libvirt.org/git/?p=libvirt.git;a=commit;h=68e5e4672a39e5aff135a898b692a7c0fc4874b2
0009-Missing-Default-Stop-field-in-LSB-comment-in-libvirt.patch - fixed upstream http://libvirt.org/git/?p=libvirt.git;a=commit;h=84094af780adf629a792d9614d88963baaa9a753
diff --git a/debian/patches/0001-remove-RHism.diff.patch b/debian/patches/0001-remove-RHism.diff.patch
index 3aeab1e..3f9a581 100644
--- a/debian/patches/0001-remove-RHism.diff.patch
+++ b/debian/patches/0001-remove-RHism.diff.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] remove-RHism.diff
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
-index c97786a..b0c312c 100644
+index 9c45a61..e3e9915 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/0002-qemu-disable-network.diff.patch b/debian/patches/0002-qemu-disable-network.diff.patch
index 841c7f2..cc44ef9 100644
--- a/debian/patches/0002-qemu-disable-network.diff.patch
+++ b/debian/patches/0002-qemu-disable-network.diff.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] qemu-disable-network.diff
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index a9a1986..8ec162a 100644
+index c13724a..12b492b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -1197,9 +1197,6 @@ if WITH_NETWORK
+@@ -1244,9 +1244,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 a9a1986..8ec162a 100644
uninstall-local::
diff --git a/src/Makefile.in b/src/Makefile.in
-index 7893ea5..1a8853e 100644
+index ea9c404..9d8df32 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -5174,9 +5174,6 @@ install-data-local:
+@@ -5426,9 +5426,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/0004-fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
index 820c168..f50f160 100644
--- a/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/0004-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 b7661c0..87155ab 100644
+index ead8ee9..33f280a 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -2269,7 +2269,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
diff --git a/debian/patches/0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch b/debian/patches/0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
index 17d0288..61adb9a 100644
--- a/debian/patches/0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
+++ b/debian/patches/0005-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 e6eb9b5..65bb6a0 100644
+index ee2de4a..9788874 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
-@@ -737,7 +737,8 @@ doRemoteOpen (virConnectPtr conn,
+@@ -732,7 +732,8 @@ doRemoteOpen (virConnectPtr conn,
}
case trans_ssh: {
@@ -29,7 +29,7 @@ index e6eb9b5..65bb6a0 100644
if (username) nr_args += 2; /* For -l username */
if (no_tty) nr_args += 5; /* For -T -o BatchMode=yes -e none */
-@@ -770,12 +771,44 @@ doRemoteOpen (virConnectPtr conn,
+@@ -765,12 +766,44 @@ doRemoteOpen (virConnectPtr conn,
cmd_argv[j++] = strdup ("none");
}
cmd_argv[j++] = strdup (priv->hostname);
diff --git a/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index ced03b8..af3e50a 100644
--- a/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -41,7 +41,7 @@ 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 64ec57b..d938800 100644
+index 11a9391..5feb029 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -1125,7 +1125,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
diff --git a/debian/patches/0007-Disable-CHECKSUM-rule.patch b/debian/patches/0007-Disable-CHECKSUM-rule.patch
index a38ac05..19ba997 100644
--- a/debian/patches/0007-Disable-CHECKSUM-rule.patch
+++ b/debian/patches/0007-Disable-CHECKSUM-rule.patch
@@ -10,10 +10,10 @@ Closes: #598330
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/util/iptables.c b/src/util/iptables.c
-index fe78d1c..e47aeda 100644
+index 6770fe0..1fce1ec 100644
--- a/src/util/iptables.c
+++ b/src/util/iptables.c
-@@ -878,6 +878,7 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx,
+@@ -861,6 +861,7 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx,
int port,
int action)
{
@@ -21,7 +21,7 @@ index fe78d1c..e47aeda 100644
char portstr[32];
snprintf(portstr, sizeof(portstr), "%d", port);
-@@ -890,6 +891,9 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx,
+@@ -874,6 +875,9 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx,
"--destination-port", portstr,
"--jump", "CHECKSUM", "--checksum-fill",
NULL);
diff --git a/debian/patches/0010-Debianize-libvirt-guests.patch b/debian/patches/0008-Debianize-libvirt-guests.patch
similarity index 91%
rename from debian/patches/0010-Debianize-libvirt-guests.patch
rename to debian/patches/0008-Debianize-libvirt-guests.patch
index fdc39d2..9ce45b1 100644
--- a/debian/patches/0010-Debianize-libvirt-guests.patch
+++ b/debian/patches/0008-Debianize-libvirt-guests.patch
@@ -4,12 +4,12 @@ Subject: [PATCH] Debianize libvirt-guests
Origin: vendor
---
- tools/libvirt-guests.init.in | 78 +++++++++++++++++------------------------
+ tools/libvirt-guests.init.in | 79 +++++++++++++++++-------------------------
tools/libvirt-guests.sysconf | 6 ++--
- 2 files changed, 35 insertions(+), 49 deletions(-)
+ 2 files changed, 35 insertions(+), 50 deletions(-)
diff --git a/tools/libvirt-guests.init.in b/tools/libvirt-guests.init.in
-index 5dab36b..0fe82fb 100644
+index e28938d..0fe82fb 100644
--- a/tools/libvirt-guests.init.in
+++ b/tools/libvirt-guests.init.in
@@ -4,8 +4,8 @@
@@ -23,7 +23,7 @@ index 5dab36b..0fe82fb 100644
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: suspend/resume libvirt guests on shutdown/boot
-@@ -14,32 +14,19 @@
+@@ -14,33 +14,19 @@
# See http://libvirt.org
### END INIT INFO
@@ -42,7 +42,8 @@ index 5dab36b..0fe82fb 100644
-libvirtd=@sbindir@/libvirtd
-
-# Source function library.
--. "$sysconfdir"/rc.d/init.d/functions
+-test ! -r "$sysconfdir"/rc.d/init.d/functions ||
+- . "$sysconfdir"/rc.d/init.d/functions
+sysconfdir=/etc
+localstatedir=/var
+libvirtd=/usr/sbin/libvirtd
@@ -64,7 +65,7 @@ index 5dab36b..0fe82fb 100644
RETVAL=0
-@@ -128,7 +115,7 @@ start() {
+@@ -129,7 +115,7 @@ start() {
[ -f "$LISTFILE" ] || { started; return 0; }
if [ "x$ON_BOOT" != xstart ]; then
@@ -73,7 +74,7 @@ index 5dab36b..0fe82fb 100644
rm -f "$LISTFILE"
started
return 0
-@@ -143,20 +130,20 @@ start() {
+@@ -144,20 +130,20 @@ start() {
fi
done
if ! $configured; then
@@ -99,7 +100,7 @@ index 5dab36b..0fe82fb 100644
fi
fi
done
-@@ -172,7 +159,7 @@ suspend_guest()
+@@ -173,7 +159,7 @@ suspend_guest()
guest=$2
name=$(guest_name $uri $guest)
@@ -108,7 +109,7 @@ index 5dab36b..0fe82fb 100644
echo -n "$label"
run_virsh $uri managedsave $guest >/dev/null &
virsh_pid=$!
-@@ -187,7 +174,7 @@ suspend_guest()
+@@ -188,7 +174,7 @@ suspend_guest()
printf '\r%s%-12s ' "$label" "..."
fi
done
@@ -117,7 +118,7 @@ index 5dab36b..0fe82fb 100644
}
shutdown_guest()
-@@ -196,7 +183,7 @@ shutdown_guest()
+@@ -197,7 +183,7 @@ shutdown_guest()
guest=$2
name=$(guest_name $uri $guest)
@@ -126,7 +127,7 @@ index 5dab36b..0fe82fb 100644
echo -n "$label"
retval run_virsh $uri shutdown $guest >/dev/null || return
timeout=$SHUTDOWN_TIMEOUT
-@@ -210,9 +197,9 @@ shutdown_guest()
+@@ -211,9 +197,9 @@ shutdown_guest()
if guest_is_on $uri $guest; then
if $guest_running; then
@@ -138,7 +139,7 @@ index 5dab36b..0fe82fb 100644
fi
fi
}
-@@ -225,7 +212,7 @@ stop() {
+@@ -226,7 +212,7 @@ stop() {
if [ "x$ON_SHUTDOWN" = xshutdown ]; then
suspending=false
if [ $SHUTDOWN_TIMEOUT -le 0 ]; then
@@ -147,7 +148,7 @@ index 5dab36b..0fe82fb 100644
RETVAL=6
return
fi
-@@ -233,10 +220,10 @@ stop() {
+@@ -234,10 +220,10 @@ stop() {
: >"$LISTFILE"
for uri in $URIS; do
@@ -160,7 +161,7 @@ index 5dab36b..0fe82fb 100644
continue
fi
-@@ -249,7 +236,7 @@ stop() {
+@@ -250,7 +236,7 @@ stop() {
empty=false
done
if $empty; then
@@ -169,7 +170,7 @@ index 5dab36b..0fe82fb 100644
else
echo
echo $uri $list >>"$LISTFILE"
-@@ -259,9 +246,9 @@ stop() {
+@@ -260,9 +246,9 @@ stop() {
while read uri list; do
if $suspending; then
@@ -181,7 +182,7 @@ index 5dab36b..0fe82fb 100644
fi
for guest in $list; do
-@@ -285,17 +272,16 @@ gueststatus() {
+@@ -286,17 +272,16 @@ gueststatus() {
# rh_status
# Display current status: whether saved state exists, and whether start
@@ -203,7 +204,7 @@ index 5dab36b..0fe82fb 100644
fi
RETVAL=0
fi
-@@ -304,7 +290,7 @@ rh_status() {
+@@ -305,7 +290,7 @@ rh_status() {
# usage [val]
# Display usage string, then exit with VAL (defaults to 2).
usage() {
diff --git a/debian/patches/0008-syntax-error-Bad-fd-number-when-stopping-libvirt-gue.patch b/debian/patches/0008-syntax-error-Bad-fd-number-when-stopping-libvirt-gue.patch
deleted file mode 100644
index 18bf0f7..0000000
--- a/debian/patches/0008-syntax-error-Bad-fd-number-when-stopping-libvirt-gue.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: =?UTF-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
-Date: Sun, 5 Dec 2010 18:53:26 +0100
-Subject: [PATCH] syntax error "Bad fd number" when stopping libvirt-guests
-
-When libvirt-guests is being stopped, I get the following message:
-$Running guests on default URI: test-vm
-$Suspending guests on default URI...
-$Suspending test-vm: /etc/init.d/libvirt-guests: 340: Syntax error: Bad fd
-number
-
-Origin: upstream, http://libvirt.org/git/?p=libvirt.git;a=commit;h=68e5e4672a39e5aff135a898b692a7c0fc4874b2
----
- AUTHORS | 1 +
- tools/libvirt-guests.init.in | 2 +-
- 2 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/AUTHORS b/AUTHORS
-index 16c755d..3b5318a 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -136,6 +136,7 @@ Patches have also been contributed by:
- Osier Yang <jyang at redhat.com>
- Kamezawa Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
- Wen Congyang <wency at cn.fujitsu.com>
-+ Laurent Léonard <laurent at open-minds.org>
-
- [....send patches to get your name here....]
-
-diff --git a/tools/libvirt-guests.init.in b/tools/libvirt-guests.init.in
-index 4e0682d..76dc627 100644
---- a/tools/libvirt-guests.init.in
-+++ b/tools/libvirt-guests.init.in
-@@ -177,7 +177,7 @@ suspend_guest()
- virsh_pid=$!
- while true; do
- sleep 1
-- kill -0 $virsh_pid >&/dev/null || break
-+ kill -0 $virsh_pid >/dev/null 2>&1 || break
- progress=$(run_virsh_c $uri domjobinfo $guest 2>/dev/null | \
- awk '/^Data processed:/{print $3, $4}')
- if [ -n "$progress" ]; then
---
diff --git a/debian/patches/0009-Missing-Default-Stop-field-in-LSB-comment-in-libvirt.patch b/debian/patches/0009-Missing-Default-Stop-field-in-LSB-comment-in-libvirt.patch
deleted file mode 100644
index b0aea85..0000000
--- a/debian/patches/0009-Missing-Default-Stop-field-in-LSB-comment-in-libvirt.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: =?UTF-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
-Date: Sun, 5 Dec 2010 19:49:39 +0100
-Subject: [PATCH] Missing "Default-Stop" field in LSB comment in libvirt-guests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The "Default-Stop" field in LSB comment in libvirt-guests is missing and should
-be added. I also suggests to add runlevel 2 to the "Default-Start" field.
-
---
-Laurent Léonard
-
-Origin: upstream, http://libvirt.org/git/?p=libvirt.git;a=commit;h=84094af780adf629a792d9614d88963baaa9a753
----
- tools/libvirt-guests.init.in | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/tools/libvirt-guests.init.in b/tools/libvirt-guests.init.in
-index 76dc627..5dab36b 100644
---- a/tools/libvirt-guests.init.in
-+++ b/tools/libvirt-guests.init.in
-@@ -6,7 +6,8 @@
- # Provides: libvirt-guests
- # Required-Start: libvirtd
- # Required-Stop: libvirtd
--# Default-Start: 3 4 5
-+# Default-Start: 2 3 4 5
-+# Default-Stop: 0 1 6
- # Short-Description: suspend/resume libvirt guests on shutdown/boot
- # Description: This is a script for suspending active libvirt guests
- # on shutdown and resuming them on next boot
---
diff --git a/debian/patches/series b/debian/patches/series
index 9448cf4..e4a0f9b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,4 @@
0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
0007-Disable-CHECKSUM-rule.patch
-0008-syntax-error-Bad-fd-number-when-stopping-libvirt-gue.patch
-0009-Missing-Default-Stop-field-in-LSB-comment-in-libvirt.patch
-0010-Debianize-libvirt-guests.patch
+0008-Debianize-libvirt-guests.patch
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list