[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/1.0.1_rc1-1
Guido Günther
agx at sigxcpu.org
Thu Dec 13 21:08:52 UTC 2012
The following commit has been merged in the experimental branch:
commit f67220647c9963b2886917d584a5968470da1c45
Author: Guido Günther <agx at sigxcpu.org>
Date: Wed Dec 12 22:32:28 2012 +0100
Update patches
diff --git a/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch b/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch
index 5cfb507..17de4a6 100644
--- a/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch
+++ b/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch
@@ -39,10 +39,10 @@ index 8c928bc..b1930ba 100644
</define>
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 81fbf99..606e528 100644
+index 60f60ed..02393f4 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
-@@ -2359,10 +2359,10 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2360,10 +2360,10 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
guest_archs[i].model,
guest_archs[i].bits,
(STREQ(hostmachine, "x86_64") ?
diff --git a/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch b/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
index 1b832e9..350ec53 100644
--- a/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
+++ b/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
@@ -7,10 +7,10 @@ Subject: Don't fail if we can't setup avahi
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
-index cf15240..e534109 100644
+index 6a5a53a..f0da93f 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
-@@ -962,8 +962,7 @@ void virNetServerRun(virNetServerPtr srv)
+@@ -1079,8 +1079,7 @@ void virNetServerRun(virNetServerPtr srv)
virNetServerLock(srv);
diff --git a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
index f714a9b..ca50173 100644
--- a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
+++ b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
@@ -10,10 +10,10 @@ Closes: #663931
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/util.c b/src/util/util.c
-index 117a50f..5f94906 100644
+index 3f244f5..d5894e9 100644
--- a/src/util/util.c
+++ b/src/util/util.c
-@@ -3028,7 +3028,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
+@@ -3045,7 +3045,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
void virFileWaitForDevices(void)
{
# ifdef UDEVADM
diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index 9163108..627e6e1 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -5,38 +5,16 @@ Subject: Debianize libvirt-guests
Origin: vendor
---
- tools/libvirt-guests.init.sh | 41 +++++++++++++----------------------------
+ tools/libvirt-guests.sh.in | 42 +++++++++++++++++++++++++-----------------
tools/libvirt-guests.sysconf | 4 ++--
- 2 files changed, 15 insertions(+), 30 deletions(-)
+ 2 files changed, 27 insertions(+), 19 deletions(-)
-diff --git a/tools/libvirt-guests.init.sh b/tools/libvirt-guests.init.sh
-index 99ef331..1285df7 100644
---- a/tools/libvirt-guests.init.sh
-+++ b/tools/libvirt-guests.init.sh
-@@ -4,8 +4,8 @@
- #
- ### BEGIN INIT INFO
- # Provides: libvirt-guests
--# Required-Start: libvirtd
--# Required-Stop: libvirtd
-+# Required-Start: $remote_fs libvirt-bin
-+# Required-Stop: $remote_fs libvirt-bin
- # Default-Start: 2 3 4 5
- # Default-Stop: 0 1 6
- # Short-Description: suspend/resume libvirt guests on shutdown/boot
-@@ -14,43 +14,29 @@
- # See http://libvirt.org
- ### END INIT INFO
-
--# the following is chkconfig init header
--#
--# libvirt-guests: suspend/resume libvirt guests on shutdown/boot
--#
--# chkconfig: 345 99 01
--# description: This is a script for suspending active libvirt guests \
--# on shutdown and resuming them on next boot \
--# See http://libvirt.org
--#
+diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
+index 1c9c46b..f36995f 100644
+--- a/tools/libvirt-guests.sh.in
++++ b/tools/libvirt-guests.sh.in
+@@ -1,32 +1,41 @@
+ #!/bin/sh
-
-sysconfdir="@sysconfdir@"
-localstatedir="@localstatedir@"
@@ -45,6 +23,20 @@ index 99ef331..1285df7 100644
-# Source function library.
-test ! -r "$sysconfdir"/rc.d/init.d/functions ||
- . "$sysconfdir"/rc.d/init.d/functions
++# the following is the LSB init header
++#
++### BEGIN INIT INFO
++# Provides: libvirt-guests
++# Required-Start: $remote_fs libvirt-bin
++# Required-Stop: $remote_fs libvirt-bin
++# 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
++# See http://libvirt.org
++### END INIT INFO
++
+sysconfdir=/etc
+localstatedir=/var
+libvirtd=/usr/sbin/libvirtd
@@ -78,7 +70,7 @@ index 99ef331..1285df7 100644
RETVAL=0
-@@ -538,8 +524,7 @@ gueststatus() {
+@@ -514,8 +523,7 @@ gueststatus() {
# rh_status
# Display current status: whether saved state exists, and whether start
diff --git a/debian/patches/debian/Debianize-systemd-service-files.patch b/debian/patches/debian/Debianize-systemd-service-files.patch
index 6de0b9c..c43ea47 100644
--- a/debian/patches/debian/Debianize-systemd-service-files.patch
+++ b/debian/patches/debian/Debianize-systemd-service-files.patch
@@ -8,11 +8,11 @@ Subject: Debianize systemd service files
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
-index b7afadf..32e40b4 100644
+index 98dd5a0..44cc560 100644
--- a/daemon/libvirtd.service.in
+++ b/daemon/libvirtd.service.in
-@@ -9,8 +9,8 @@ Before=libvirt-guests.service
- After=network.target
+@@ -10,8 +10,8 @@ After=network.target
+ After=dbus.service
[Service]
-EnvironmentFile=-/etc/sysconfig/libvirtd
@@ -23,7 +23,7 @@ index b7afadf..32e40b4 100644
KillMode=process
# Override the maximum number of opened files
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
-index 0f0c41c..b9d8a91 100644
+index d41bf2b..35c9959 100644
--- a/tools/libvirt-guests.service.in
+++ b/tools/libvirt-guests.service.in
@@ -3,7 +3,7 @@ Description=Suspend Active Libvirt Guests
@@ -34,4 +34,4 @@ index 0f0c41c..b9d8a91 100644
+EnvironmentFile=-/etc/default/libvirt-guests
# Hack just call traditional service until we factor
# out the code
- ExecStart=/etc/init.d/libvirt-guests start
+ ExecStart=@libexecdir@/libvirt-guests.sh start
diff --git a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
index 10a7e42..f281a3c 100644
--- a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
+++ b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
@@ -10,10 +10,10 @@ to not interfere with existing network configurations
2 files changed, 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index 187663f..94f807e 100644
+index 6d2816d..6453370 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -1768,9 +1768,6 @@ if WITH_NETWORK
+@@ -1789,9 +1789,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; }
@@ -24,10 +24,10 @@ index 187663f..94f807e 100644
uninstall-local::
diff --git a/src/Makefile.in b/src/Makefile.in
-index 230e879..cd3e29f 100644
+index 7c1f97e..7e07b03 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -6907,9 +6907,6 @@ install-data-local:
+@@ -6994,9 +6994,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/debian/fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
index f823ae6..ebf2201 100644
--- a/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
@@ -13,10 +13,10 @@ Closes: #517059
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 406079b..81fbf99 100644
+index 237a6ab..60f60ed 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
-@@ -2362,7 +2362,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2363,7 +2363,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
"/usr/lib64/xen/bin/qemu-dm" :
"/usr/lib/xen/bin/qemu-dm"),
(guest_archs[i].hvm ?
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index fd660cd..5c7239e 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/remove-RHism.diff.patch
@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 76f32c2..10536c1 100644
+index 3687a4d..21d95eb 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -107,7 +107,7 @@ alphabetic character, @, [, ], \, ^, _.
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 59c5536..10af0c2 100644
--- a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -42,7 +42,7 @@ to savely detect that the command 'info migrate' is not implemented.
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index 09f2a92..80a212f 100644
+index fa10600..a4b5e7b 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -1593,7 +1593,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list