aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2021-05-28 08:18:08 +0200
committerRafał Miłecki <rafal@milecki.pl>2021-05-28 16:04:04 +0200
commitc2139eef279ef9efc30ddbaf08544f33eac63e36 (patch)
tree9c5f438d2ade0d15a3ff2d079b6d29a0fc9cfbbe
parent0bc3f51aa650ec9fea995233714219d2cb63f53c (diff)
downloadupstream-c2139eef279ef9efc30ddbaf08544f33eac63e36.tar.gz
upstream-c2139eef279ef9efc30ddbaf08544f33eac63e36.tar.bz2
upstream-c2139eef279ef9efc30ddbaf08544f33eac63e36.zip
base-files: simplify setting device MAC
1. Move code above interface generation It results in more logical order. Device gets its config section above interface section. 2. Drop the loop We have separated code handling bridges now so $device should be guaranteed to contain a single device name. 3. Drop section name It's not required by netifd or LuCI & it's not needed by this script as $device contains a single device name now. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit e002179a6d2eea8640e262160030336bea54ec26)
-rwxr-xr-xpackage/base-files/files/bin/config_generate19
1 files changed, 8 insertions, 11 deletions
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index d895090309..0dca5549e8 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -133,6 +133,14 @@ generate_network() {
type=""
}
+ if [ -n "$macaddr" ]; then
+ uci -q batch <<-EOF
+ add network device
+ set network.@device[-1].name='$device'
+ set network.@device[-1].macaddr='$macaddr'
+ EOF
+ fi
+
uci -q batch <<-EOF
delete network.$1
set network.$1='interface'
@@ -141,17 +149,6 @@ generate_network() {
set network.$1.proto='none'
EOF
- if [ -n "$macaddr" ]; then
- for name in $device; do
- uci -q batch <<-EOF
- delete network.$1_${name/./_}_dev
- set network.$1_${name/./_}_dev='device'
- set network.$1_${name/./_}_dev.name='$name'
- set network.$1_${name/./_}_dev.macaddr='$macaddr'
- EOF
- done
- fi
-
case "$protocol" in
static)
local ipad