1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
|
From: Guido Guenther <agx@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/Makefile.in | 3 +--
src/network/Makefile.inc.am | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
index 9a215e4..ace56ba 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14837,8 +14837,7 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
@WITH_NETWORK_TRUE@ $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
@WITH_NETWORK_TRUE@ ( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
-@WITH_NETWORK_TRUE@ rm -f default.xml && \
-@WITH_NETWORK_TRUE@ $(LN_S) ../default.xml default.xml )
+@WITH_NETWORK_TRUE@ rm -f default.xml )
@WITH_FIREWALLD_ZONE_TRUE@@WITH_NETWORK_TRUE@ $(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones"
@WITH_FIREWALLD_ZONE_TRUE@@WITH_NETWORK_TRUE@ $(INSTALL_DATA) $(srcdir)/network/libvirt.zone \
@WITH_FIREWALLD_ZONE_TRUE@@WITH_NETWORK_TRUE@ $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml
diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index 23cf39b..ca516c3 100644
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -87,8 +87,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 \
|