[Pkg-libvirt-commits] [libvirt] 04/14: Rediff patches

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to branch experimental
in repository libvirt.

commit 113b58be1755cba4447b98a83b3deaa1a6f89199
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Jan 22 10:22:54 2015 +0100

    Rediff patches
---
 debian/patches/debian/Don-t-enable-default-network-on-boot.patch  | 8 ++++----
 debian/patches/debian/remove-RHism.diff.patch                     | 2 +-
 debian/patches/lxc-Don-t-crash-on-NULL-ifname_guest_actual.patch  | 2 +-
 .../lxc-Move-setting-ifname_guest_actual-to-virLXCSetupI.patch    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

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 e571010..41526a6 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
@@ -9,10 +9,10 @@ to not interfere with existing network configurations
  2 files changed, 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index b6c1701..3387205 100644
+index 550362c..b117fb2 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -2765,9 +2765,6 @@ if WITH_NETWORK
+@@ -2766,9 +2766,6 @@ if WITH_NETWORK
  	    cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
  	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
@@ -23,10 +23,10 @@ index b6c1701..3387205 100644
  
  uninstall-local:: uninstall-init uninstall-systemd
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 04f1a43..b221b44 100644
+index 8021344..d42d2c3 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -10623,9 +10623,6 @@ install-data-local: install-init install-systemd
+@@ -10636,9 +10636,6 @@ install-data-local: install-init install-systemd
  @WITH_NETWORK_TRUE@	    cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
  @WITH_NETWORK_TRUE@	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index 1ee1ef7..1cbd2bd 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 cbd82275..9dce07e 100644
+index 0eba2c1..d5ce7e3 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.
diff --git a/debian/patches/lxc-Don-t-crash-on-NULL-ifname_guest_actual.patch b/debian/patches/lxc-Don-t-crash-on-NULL-ifname_guest_actual.patch
index 26a9ffe..84bdafa 100644
--- a/debian/patches/lxc-Don-t-crash-on-NULL-ifname_guest_actual.patch
+++ b/debian/patches/lxc-Don-t-crash-on-NULL-ifname_guest_actual.patch
@@ -7,7 +7,7 @@ Subject: lxc: Don't crash on NULL ifname_guest_actual
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
-index 3b08b86..cccf327 100644
+index 1b9e2f2..f986f71 100644
 --- a/src/lxc/lxc_container.c
 +++ b/src/lxc/lxc_container.c
 @@ -472,7 +472,7 @@ lxcContainerGetNetDef(virDomainDefPtr vmDef, const char *devName)
diff --git a/debian/patches/lxc-Move-setting-ifname_guest_actual-to-virLXCSetupI.patch b/debian/patches/lxc-Move-setting-ifname_guest_actual-to-virLXCSetupI.patch
index ccc475b..d0d3610 100644
--- a/debian/patches/lxc-Move-setting-ifname_guest_actual-to-virLXCSetupI.patch
+++ b/debian/patches/lxc-Move-setting-ifname_guest_actual-to-virLXCSetupI.patch
@@ -8,7 +8,7 @@ so it applies to interfaces of type 'direct' too.
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
-index 632fc17..d09a890 100644
+index 1c0d4e5..c3818a5 100644
 --- a/src/lxc/lxc_process.c
 +++ b/src/lxc/lxc_process.c
 @@ -260,8 +260,6 @@ char *virLXCProcessSetupInterfaceBridged(virConnectPtr conn,
@@ -20,7 +20,7 @@ index 632fc17..d09a890 100644
  
      if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) {
          if (virNetDevOpenvswitchAddPort(brname, parentVeth, &net->mac,
-@@ -430,6 +428,9 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn,
+@@ -432,6 +430,9 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn,
  
          (*veths)[(*nveths)-1] = veth;
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git