diff options
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rw-r--r-- | package/base-files/files/lib/preinit/10_indicate_preinit | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 87c43fdc0c..f0085e5690 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=216 +PKG_RELEASE:=217 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit index c3ec7bfdf7..423c425223 100644 --- a/package/base-files/files/lib/preinit/10_indicate_preinit +++ b/package/base-files/files/lib/preinit/10_indicate_preinit @@ -33,6 +33,11 @@ preinit_config_switch() { json_get_vars enable reset + if [ "$reset" -eq "1" ]; then + swconfig dev $name set reset + fi + swconfig dev $name set enable_vlan $enable + if json_is_a roles array; then json_get_keys roles roles json_select roles @@ -43,19 +48,15 @@ preinit_config_switch() { json_select .. if [ "$device" = "$lan_if" ]; then - if [ "$reset" -eq "1" ]; then - swconfig dev $name set reset - fi - - swconfig dev $name set enable_vlan $enable swconfig dev $name vlan $role set ports "$ports" - swconfig dev $name set apply fi done json_select .. fi + swconfig dev $name set apply + json_select .. json_select .. } |