From ccfde6c655ee8f16319587cea16f4e4a944ff11d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Sun, 8 Sep 2019 15:09:06 +0200 Subject: [PATCH] fff-network: Remove dependency to uradvd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As odhcpd is used as router advertisement server in layer3 variant, but configurenetwork is still necessary, the dependency to fff-uradvd has to be removed. This is done by first checking, if the fff-uradvd service exists, before it is restarted. Signed-off-by: Fabian Bläse Reviewed-by: Christian Dresel Reviewed-by: Robert Langhammer --- src/packages/fff/fff-network/Makefile | 2 +- src/packages/fff/fff-network/files/usr/sbin/configurenetwork | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile index 3a2b8c21..19d3aad4 100644 --- a/src/packages/fff/fff-network/Makefile +++ b/src/packages/fff/fff-network/Makefile @@ -12,7 +12,7 @@ define Package/$(PKG_NAME) CATEGORY:=Freifunk TITLE:= Freifunk-Franken network configuration URL:=http://www.freifunk-franken.de - DEPENDS:=+fff-uradvd +fff-boardname +fff-firewall + DEPENDS:=+fff-boardname +fff-firewall endef define Package/$(PKG_NAME)/description diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork index cac00362..0ae7ba8a 100755 --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork +++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork @@ -259,5 +259,5 @@ else uci -q commit network - /etc/init.d/fff-uradvd restart + [ -s /etc/init.d/fff-uradvd ] && /etc/init.d/fff-uradvd restart fi