From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 22 Sep 2018 12:05:46 +0000 (+0100)
Subject: boot: Fix bringing up zones when system is booting
X-Git-Tag: 010~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaa34bff87922cb0c9aa81494ee8d1a33f3556f0;p=network.git

boot: Fix bringing up zones when system is booting

An incorrect target was required and no zone was brought
up during boot.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/hooks/zones/bridge b/src/hooks/zones/bridge
index 893f4523..33d5378d 100644
--- a/src/hooks/zones/bridge
+++ b/src/hooks/zones/bridge
@@ -138,12 +138,10 @@ hook_hotplug() {
 		add)
 			# Handle ports of this zone that have just been added
 			if hotplug_event_interface_is_port_of_zone "${zone}"; then
-				# Bring up the zone if it is enabled but not active, yet.
-				if zone_is_enabled "${zone}" && ! zone_is_active "${zone}"; then
-					zone_start "${zone}"
+				# Attach the device if the parent bridge is up
+				if zone_is_active "${zone}"; then
+					hook_port_up "${zone}" "${INTERFACE}"
 				fi
-
-				hook_port_up "${zone}" "${INTERFACE}"
 			fi
 			;;
 		remove)
diff --git a/src/systemd/network@.service.in b/src/systemd/network@.service.in
index 340b1965..e7d26d74 100644
--- a/src/systemd/network@.service.in
+++ b/src/systemd/network@.service.in
@@ -3,7 +3,6 @@ Description=Network Connectivity for zone %I
 After=firewall-init.service network-init.service
 Requires=firewall-init.service network-init.service
 Wants=network.target
-Before=network.target
 
 [Service]
 Type=oneshot
@@ -14,4 +13,4 @@ ExecReload=@sbindir@/network zone %I reload
 
 [Install]
 WantedBy=network.target
-Alias=network.target.wants/network@%i.service
+Alias=network.target.wants/network@%i.service multi-user.target.wants/network@%i.service