[Pkg-libvirt-commits] [libvirt] 05/06: 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 c8151f59b8709fd282a3289f477bc507fa92c666
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Dec 1 22:02:16 2013 +0100

    Rediff patches
---
 .../debian/Debianize-systemd-service-files.patch   | 25 ++++++----------------
 .../Don-t-enable-default-network-on-boot.patch     |  8 +++----
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/debian/patches/debian/Debianize-systemd-service-files.patch b/debian/patches/debian/Debianize-systemd-service-files.patch
index a5a9c92..aaf3445 100644
--- a/debian/patches/debian/Debianize-systemd-service-files.patch
+++ b/debian/patches/debian/Debianize-systemd-service-files.patch
@@ -3,10 +3,9 @@ Date: Tue, 26 Jun 2012 09:30:39 +0200
 Subject: Debianize systemd service files
 
 ---
- daemon/libvirtd.service.in       | 4 ++--
- src/locking/virtlockd.service.in | 1 -
- tools/libvirt-guests.service.in  | 4 ++--
- 3 files changed, 4 insertions(+), 5 deletions(-)
+ daemon/libvirtd.service.in      | 4 ++--
+ tools/libvirt-guests.service.in | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
 index 25979ef..ae7bf8e 100644
@@ -23,27 +22,15 @@ index 25979ef..ae7bf8e 100644
  ExecReload=/bin/kill -HUP $MAINPID
  KillMode=process
  Restart=on-failure
-diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
-index a9f9f93..0ef9923 100644
---- a/src/locking/virtlockd.service.in
-+++ b/src/locking/virtlockd.service.in
-@@ -1,7 +1,6 @@
- [Unit]
- Description=Virtual machine lock manager
- Requires=virtlockd.socket
--After=syslog.target
- 
- [Service]
- EnvironmentFile=-/etc/sysconfig/virtlockd
 diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
-index d41bf2b..64e97e2 100644
+index d48d4b8..db12a64 100644
 --- a/tools/libvirt-guests.service.in
 +++ b/tools/libvirt-guests.service.in
 @@ -1,9 +1,9 @@
  [Unit]
  Description=Suspend Active Libvirt Guests
--After=syslog.target network.target
-+After=network.target
+-After=network.target libvirtd.service
++After=network.target libvirt-bin.service
  
  [Service]
 -EnvironmentFile=-/etc/sysconfig/libvirt-guests
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 9a376db..a1596b6 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 21b9caf..18cb9e2 100644
+index 87f5101..e8e5fef 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -2545,9 +2545,6 @@ if WITH_NETWORK
+@@ -2558,9 +2558,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 21b9caf..18cb9e2 100644
  
  uninstall-local:: uninstall-init uninstall-systemd
 diff --git a/src/Makefile.in b/src/Makefile.in
-index cf35fe1..aa405e6 100644
+index 166e642..3d9dd91 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -9594,9 +9594,6 @@ install-data-local: install-init install-systemd
+@@ -9637,9 +9637,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; }

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