rohammer
/
firmware
forked from freifunk-franken/firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fff-layer3-config: fix exit status of uci-default scripts 

OpenWrt only removes uci-defaults scripts if the exit status of the
executed script is 0. Fix the exit code of the layer3-config migration
scripts so they are removed as intended.

Fixes: #313

Signed-off-by: Fabian Bläse <fabian@blaese.de>
This commit is contained in:
Fabian Bläse 2024-03-17 21:58:57 +01:00
parent 797c3ddca0
commit 1d2c835b53
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/packages/fff/fff-layer3-config/files/etc/uci-defaults/20-l3config-migrate-1-to-2
View File

@ -7,7 +7,7 @@
BOARD="$(uci get board.model.name)"
# only migrate appropriate config versions
[ "$(uci -q get gateway.meta.config_version)" = "1" ] || exit 1
[ "$(uci -q get gateway.meta.config_version)" = "1" ] || exit 0
translate_ports() {
local vlan="$1"
@ -77,3 +77,5 @@ esac
uci set gateway.meta.config_version='2'
uci commit gateway
exit 0

4
src/packages/fff/fff-layer3-config/files/etc/uci-defaults/21-l3config-migrate-2-to-3
View File

@ -7,7 +7,7 @@
BOARD="$(uci get board.model.name)"
# only migrate appropriate config versions
[ "$(uci -q get gateway.meta.config_version)" = "2" ] || exit 1
[ "$(uci -q get gateway.meta.config_version)" = "2" ] || exit 0
translate_ports() {
local vlan="$1"
@ -74,3 +74,5 @@ esac
uci set gateway.meta.config_version='3'
uci commit gateway
exit 0