| Message ID | 1467471640-22044-1-git-send-email-dev@kresin.me |
|---|---|
| State | Changes Requested |
| Delegated to: | John Crispin |
| Headers | show |
On 02/07/16 16:00, Mathias Kresin wrote: > Signed-off-by: Mathias Kresin <dev@kresin.me> > --- > package/base-files/files/bin/config_generate | 5 +++-- > package/base-files/files/lib/functions/uci-defaults.sh | 2 ++ > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate > index 7f34eec..8919d31 100755 > --- a/package/base-files/files/bin/config_generate > +++ b/package/base-files/files/bin/config_generate > @@ -24,8 +24,8 @@ generate_static_network() { > json_select dsl > if json_is_a atmbridge object; then > json_select atmbridge > - local vpi vci encaps payload > - json_get_vars vpi vci encaps payload > + local vpi vci encaps payload mac > + json_get_vars vpi vci encaps payload mac > uci -q batch <<-EOF > delete network.atm > set network.atm='atm-bridge' > @@ -33,6 +33,7 @@ generate_static_network() { > set network.atm.vci='$vci' > set network.atm.encaps='$encaps' > set network.atm.payload='$payload' > + set network.atm.mac='$mac' > EOF > json_select .. > fi > diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh > index 8c95437..6623be9 100755 > --- a/package/base-files/files/lib/functions/uci-defaults.sh > +++ b/package/base-files/files/lib/functions/uci-defaults.sh > @@ -315,6 +315,7 @@ ucidef_add_atm_bridge() { > local vci="$2" > local encaps="$3" > local payload="$4" > + local mac="$5" > > json_select_object dsl > json_select_object atmbridge > @@ -322,6 +323,7 @@ ucidef_add_atm_bridge() { > json_add_int vci "$vci" > json_add_string encaps "$encaps" > json_add_string payload "$payload" > + json_add_string mac "$mac" > json_select .. > json_select .. > } For this patch set: Tested-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> Actually it should be something like Guinea-pig/remote compile,test bot/to destruction/and back again by: Kevin Darbyshire-Bryant :-)
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate index 7f34eec..8919d31 100755 --- a/package/base-files/files/bin/config_generate +++ b/package/base-files/files/bin/config_generate @@ -24,8 +24,8 @@ generate_static_network() { json_select dsl if json_is_a atmbridge object; then json_select atmbridge - local vpi vci encaps payload - json_get_vars vpi vci encaps payload + local vpi vci encaps payload mac + json_get_vars vpi vci encaps payload mac uci -q batch <<-EOF delete network.atm set network.atm='atm-bridge' @@ -33,6 +33,7 @@ generate_static_network() { set network.atm.vci='$vci' set network.atm.encaps='$encaps' set network.atm.payload='$payload' + set network.atm.mac='$mac' EOF json_select .. fi diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh index 8c95437..6623be9 100755 --- a/package/base-files/files/lib/functions/uci-defaults.sh +++ b/package/base-files/files/lib/functions/uci-defaults.sh @@ -315,6 +315,7 @@ ucidef_add_atm_bridge() { local vci="$2" local encaps="$3" local payload="$4" + local mac="$5" json_select_object dsl json_select_object atmbridge @@ -322,6 +323,7 @@ ucidef_add_atm_bridge() { json_add_int vci "$vci" json_add_string encaps "$encaps" json_add_string payload "$payload" + json_add_string mac "$mac" json_select .. json_select .. }
Signed-off-by: Mathias Kresin <dev@kresin.me> --- package/base-files/files/bin/config_generate | 5 +++-- package/base-files/files/lib/functions/uci-defaults.sh | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-)