| Message ID | 20190908130906.17964-2-fabian@blaese.de |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile index 3a2b8c2..19d3aad 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 448bd04..750390d 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
hi Reviewed-by: Christian Dresel <fff@chrisi01.de> Gruß Christian On 08.09.19 15:09, Fabian Bläse wrote: > 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 <fabian@blaese.de> > --- > 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 3a2b8c2..19d3aad 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 448bd04..750390d 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 >
Hi, bis wir das configurenetwork mal richtig umbauen, tuts das. Reviewed-by: Robert Langhammer <rlanghammer@web.de> Am 08.09.19 um 15:09 schrieb Fabian Bläse: > 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 <fabian@blaese.de> > --- > 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 3a2b8c2..19d3aad 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 448bd04..750390d 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
applied.
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 <fabian@blaese.de> --- src/packages/fff/fff-network/Makefile | 2 +- src/packages/fff/fff-network/files/usr/sbin/configurenetwork | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)