From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: network@lists.ipfire.org
Subject: [PATCH v2] Fix radvd startup
Date: Sat, 10 Feb 2018 12:14:05 +0000
Message-ID: <1518264845-8257-1-git-send-email-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2315063109959301918=="
List-Id: <network.lists.ipfire.org>

--===============2315063109959301918==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

We now only start radvd when we write a config for a zone into the config
file.

Fixes: #11450

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 src/functions/functions.radvd | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/functions/functions.radvd b/src/functions/functions.radvd
index 4e41160..1c8b8d0 100644
--- a/src/functions/functions.radvd
+++ b/src/functions/functions.radvd
@@ -23,16 +23,16 @@ RADVD_CONFIGFILE=3D"/etc/radvd.conf"
=20
 radvd_update() {
 	# (Re-)write the configuration file
-	radvd_write_config
-
-	# Reload the radvd service if it is already running
-	if service_is_active radvd; then
-		service_reload radvd
-		return ${EXIT_OK}
+	if radvd_write_config; then
+		# Reload the radvd service if it is already running
+		if service_is_active radvd; then
+			service_reload radvd
+			return ${EXIT_OK}
+		fi
+
+		# Start the radvd service
+		service_start radvd
 	fi
-
-	# Start the radvd service
-	service_start radvd
 }
=20
 radvd_clear_config() {
@@ -48,14 +48,21 @@ radvd_write_config() {
=20
 	# Write the configuration for all zones.
 	local zone
-	for zone in $(zones_get_local); do
-		__radvd_config_interface ${zone}
=20
+	# The return value determine if radvd is started or not
+	local return_value=3D${EXIT_FALSE}
+
+	for zone in $(zones_get_local); do
+		if __radvd_config_interface ${zone}; then
+			# We return TRUE when __radvd_config_interface returns True
+			return_value=3D${EXIT_TRUE}
+		fi
 	done >> ${RADVD_CONFIGFILE}
=20
-	return ${EXIT_OK}
+	return ${return_value}
 }
=20
+# This function return ${EXIT_FALSE} if no radvd config was written and ${EX=
IT_TRUE} in all other cases
 __radvd_config_interface() {
 	local zone=3D${1}
 	assert isset zone
@@ -65,17 +72,17 @@ __radvd_config_interface() {
 	# If the interface does not provide any routing information,
 	# we can skip this whole stuff.
 	if ! db_exists "${zone}/ipv6"; then
-		return ${EXIT_OK}
+		return ${EXIT_FALSE}
 	fi
=20
 	# Skip if zone is not active.
 	local active=3D"$(db_get "${zone}/ipv6/active")"
-	[ "${active}" =3D "0" ] && return ${EXIT_OK}
+	[ "${active}" =3D "0" ] && return ${EXIT_FALSE}
=20
 	# Skip if there is no prefix or prefix is link-local.
 	local addr=3D"$(db_get "${zone}/ipv6/local-ip-address")"
 	if [ -z "${addr}" ] || [ "${addr:0:5}" =3D "fe80:" ]; then
-		return ${EXIT_OK}
+		return ${EXIT_FALSE}
 	fi
=20
 	# Check if the subnet is configured by the DHCP server.
@@ -116,6 +123,8 @@ __radvd_config_interface() {
=20
 	print "};"
 	print
+
+	return ${EXIT_TRUE}
 }
=20
 __radvd_config_dns() {
--=20
2.6.3


--===============2315063109959301918==--