From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 6 Sep 2014 15:15:25 +0000 (+0200)
Subject: zone: Send systemd updates on hotplug events
X-Git-Tag: 007~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6fd23fd31b73042e461f3fd70e68a1fff3a9080;p=network.git

zone: Send systemd updates on hotplug events
---

diff --git a/src/functions/functions.zone b/src/functions/functions.zone
index 55ca681d..c6c9f388 100644
--- a/src/functions/functions.zone
+++ b/src/functions/functions.zone
@@ -91,6 +91,13 @@ function zone_stop() {
 	service_stop "network@${zone}.service"
 }
 
+function zone_reload() {
+	local zone="${1}"
+	assert zone_exists "${zone}"
+
+	service_reload "network@${zone}.service"
+}
+
 function zone_enable() {
 	# This function will enable the zone
 	# with help of systemd.
@@ -143,6 +150,17 @@ function zone_is_enabled() {
 	return ${EXIT_FALSE}
 }
 
+function zone_is_active() {
+	local zone="${1}"
+	assert isset zone
+
+	if service_is_active "network@${zone}.service"; then
+		return ${EXIT_TRUE}
+	fi
+
+	return ${EXIT_FALSE}
+}
+
 function zone_create() {
 	local zone=${1}
 	local hook=${2}
diff --git a/src/network b/src/network
index 336e9c38..d6a0817f 100644
--- a/src/network
+++ b/src/network
@@ -524,7 +524,7 @@ function cli_zone() {
 
 		# Action aliases
 		case "${action}" in
-			start)
+			start|reload)
 				action="up"
 				;;
 			stop)
diff --git a/src/systemd/network@.service.in b/src/systemd/network@.service.in
index 14da23df..340b1965 100644
--- a/src/systemd/network@.service.in
+++ b/src/systemd/network@.service.in
@@ -10,6 +10,7 @@ Type=oneshot
 RemainAfterExit=yes
 ExecStart=@sbindir@/network zone %I up
 ExecStop=@sbindir@/network zone %I down
+ExecReload=@sbindir@/network zone %I reload
 
 [Install]
 WantedBy=network.target
diff --git a/src/udev/network-hotplug b/src/udev/network-hotplug
index 09ecc0c4..24681251 100644
--- a/src/udev/network-hotplug
+++ b/src/udev/network-hotplug
@@ -114,8 +114,10 @@ case "${ACTION}" in
 
 		# If the zone is already up or enabled for auto-start,
 		# we add the device to the zone.
-		if zone_is_up "${zone}" || zone_is_enabled "${zone}"; then
-			zone_up "${zone}"
+		if zone_is_active "${zone}"; then
+			zone_reload "${zone}"
+		elif zone_is_enabled "${zone}"; then
+			zone_start "${zone}"
 		fi
 		;;