Skip to content

Commit

Permalink
fff-support: Update PoE passthrough code
Browse files Browse the repository at this point in the history
This implements an upgrade safe solution for the PoE passthrough
on multiple devices. Since LEDE already provides the relevant
settings, a check whether those are in place enables both
identification of affected devices and automatic deactivation
if parameters are changed.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Tim Niemeyer <tim@tn-x.org>
  • Loading branch information
adschm authored and RedDog99 committed Nov 12, 2017
1 parent 39d147d commit 84432f7
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,8 @@ uci -q set "simple-tc.example.limit_ingress=${traffic_in}"
uci -q set "simple-tc.example.limit_egress=${traffic_out}"

uci -q commit

poe_passthrough=$(uci -q get "fff.poe_passthrough.active")
if [ "$poe_passthrough" = "1" ] && [ -s /usr/lib/fff-support/activate_poe_passthrough.sh ] ; then
/usr/lib/fff-support/activate_poe_passthrough.sh
fi
2 changes: 1 addition & 1 deletion src/packages/fff/fff-support/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ define Package/$(PKG_NAME)
CATEGORY:=Freifunk
TITLE:=Freifunk-Franken Support Scripts
URL:=http://www.freifunk-franken.de
DEPENDS:=+@BUSYBOX_CONFIG_ASH
DEPENDS:=+@BUSYBOX_CONFIG_ASH +fff-config
endef

define Package/$(PKG_NAME)/description
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh
# This enables PoE passthrough so it is persistent through reboots,
# but reset after firmware upgrade

if uci -q get "system.poe_passthrough" > /dev/null ; then
uci -q set "system.poe_passthrough.value=1"
uci -q commit system
/etc/init.d/gpio_switch restart
fi

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh
# This disables PoE passthrough permanently

uci -q set "fff.poe_passthrough=fff"
uci -q set "fff.poe_passthrough.active=0"
uci -q commit fff

if uci -q get "system.poe_passthrough" > /dev/null ; then
uci -q set "system.poe_passthrough.value=0"
uci -q commit system
/etc/init.d/gpio_switch restart
fi
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh
# This enables PoE passthrough permanently, so it is persistent
# during firmware upgrades

uci -q set "fff.poe_passthrough=fff"
uci -q set "fff.poe_passthrough.active=1"
uci -q commit fff

/usr/lib/fff-support/activate_poe_passthrough.sh

0 comments on commit 84432f7

Please sign in to comment.