[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/experimental] 2 commits: patches: Drop debian/Don-t-enable-default-network-on-boot.patch

[Guido Günther]

Guido Günther pushed to branch debian/experimental at Libvirt Packaging Team / libvirt


Commits:
36eaf769 by Andrea Bolognani at 2020-08-18T20:17:55+02:00
patches: Drop debian/Don-t-enable-default-network-on-boot.patch

We're going to achieve the same result without needing to patch
the upstream build system.

Gbp-Dch: Ignore

- - - - -
7beca8e1 by Andrea Bolognani at 2020-08-18T20:19:30+02:00
rules: Don't autostart the default network

Upstream enables this by default, but we don't want it for
Debian. To disable autostart, all we need to do is remove the
symlink before dh_install has a chance to pick it up.

Gbp-Dch: Ignore

- - - - -


3 changed files:

- − debian/patches/debian/Don-t-enable-default-network-on-boot.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/patches/debian/Don-t-enable-default-network-on-boot.patch deleted
=====================================
@@ -1,23 +0,0 @@
-From: Guido Guenther <agx at sigxcpu.org>
-Date: Fri, 7 Mar 2008 09:08:26 +0100
-Subject: Don't enable default network on boot
-
-to not interfere with existing network configurations
----
- src/network/Makefile.inc.am | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
-index 196a30e..6fb4917 100644
---- a/src/network/Makefile.inc.am
-+++ b/src/network/Makefile.inc.am
-@@ -168,8 +168,7 @@ install-data-network:
- 	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
- 	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
- 	( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
--	  rm -f default.xml && \
--	  $(LN_S) ../default.xml default.xml )
-+	  rm -f default.xml )
- if WITH_FIREWALLD_ZONE
- 	$(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones"
- 	$(INSTALL_DATA) $(srcdir)/network/libvirt.zone \


=====================================
debian/patches/series
=====================================
@@ -3,7 +3,6 @@ debian/Debianize-systemd-service-files.patch
 debian/Debianize-virtlockd.patch
 debian/Debianize-virtlogd.patch
 Skip-vircgrouptest.patch
-debian/Don-t-enable-default-network-on-boot.patch
 Reduce-udevadm-settle-timeout-to-10-seconds.patch
 debian/Use-upstreams-polkit-rule.patch
 debian/apparmor_profiles_local_include.patch


=====================================
debian/rules
=====================================
@@ -209,6 +209,9 @@ override_dh_auto_install:
 	# triggers the privacy-breach-generic Lintian tag
 	rm $(DEB_DESTDIR)/usr/share/doc/libvirt/html/ci.html
 
+	# Don't autostart the default network
+	rm $(DEB_DESTDIR)/etc/libvirt/qemu/networks/autostart/default.xml
+
 override_dh_install-arch:
 	dh_install
 



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/dd2d1a9e504fd634fe14bdc9be1c8f0fcc6d3537...7beca8e1bce61c6821fabd445c68fd298073ad18

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/dd2d1a9e504fd634fe14bdc9be1c8f0fcc6d3537...7beca8e1bce61c6821fabd445c68fd298073ad18
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20200819/2979517c/attachment-0001.html>