Message ID | 20170904135301.32435-1-fabian@blaese.de |
---|---|
State | Rejected |
Headers | show |
diff --git a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/05-config-system-migration b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/05-config-system-migration index 0e36587..3b249ae 100644 --- a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/05-config-system-migration +++ b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/05-config-system-migration @@ -6,6 +6,7 @@ UPGRADE_latitude=$(uci -q get "system.@system[0].latitude") UPGRADE_longitude=$(uci -q get "system.@system[0].longitude") UPGRADE_position_comment=$(uci -q get "system.@system[0].position_comment") UPGRADE_contact=$(uci -q get "system.@system[0].contact") +UPGRADE_hood=$(uci -q get "system.@system[0].hood") /bin/rm -rf /etc/config/system @@ -17,5 +18,6 @@ test -n "${UPGRADE_latitude}" && uci -q set "system.@system[0].latitude=${UPGRAD test -n "${UPGRADE_longitude}" && uci -q set "system.@system[0].longitude=${UPGRADE_longitude}" test -n "${UPGRADE_position_comment}" && uci -q set "system.@system[0].position_comment=${UPGRADE_position_comment}" test -n "${UPGRADE_contact}" && uci -q set "system.@system[0].contact=${UPGRADE_contact}" +test -n "${UPGRADE_hood}" && uci -q set "system.@system[0].hood=${UPGRADE_hood}" uci -q commit system
hi Danke für das Patch und das auffinden des Problems, hab ich doch glatt damals übersehen. Sieht gut aus daher: Reviewed-by: Christian Dresel <fff@chrisi01.de> mfg Christian On 04.09.2017 15:53, Fabian Bläse wrote: > Signed-off-by: Fabian Bläse <fabian@blaese.de> > --- > .../fff-sysupgrade/files/etc/uci-defaults/05-config-system-migration | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/05-config-system-migration b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/05-config-system-migration > index 0e36587..3b249ae 100644 > --- a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/05-config-system-migration > +++ b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/05-config-system-migration > @@ -6,6 +6,7 @@ UPGRADE_latitude=$(uci -q get "system.@system[0].latitude") > UPGRADE_longitude=$(uci -q get "system.@system[0].longitude") > UPGRADE_position_comment=$(uci -q get "system.@system[0].position_comment") > UPGRADE_contact=$(uci -q get "system.@system[0].contact") > +UPGRADE_hood=$(uci -q get "system.@system[0].hood") > > /bin/rm -rf /etc/config/system > > @@ -17,5 +18,6 @@ test -n "${UPGRADE_latitude}" && uci -q set "system.@system[0].latitude=${UPGRAD > test -n "${UPGRADE_longitude}" && uci -q set "system.@system[0].longitude=${UPGRADE_longitude}" > test -n "${UPGRADE_position_comment}" && uci -q set "system.@system[0].position_comment=${UPGRADE_position_comment}" > test -n "${UPGRADE_contact}" && uci -q set "system.@system[0].contact=${UPGRADE_contact}" > +test -n "${UPGRADE_hood}" && uci -q set "system.@system[0].hood=${UPGRADE_hood}" > > uci -q commit system >
Hi Das ist ein sehr guter Fund, jedoch werde ich diesen Patch nicht applien, weil absehbar ist, dass die hood config nicht mehr manuell sondern durch ein Script (regelmäßig) gesetzt wird. Daher muss diese Einstellung das Update nicht überleben. Tut mir leid, das ich so spät drüber schau, sonst wäre es rein gekommen. Tim Am Montag, den 04.09.2017, 15:53 +0200 schrieb Fabian Bläse: > Signed-off-by: Fabian Bläse <fabian@blaese.de> > --- > .../fff-sysupgrade/files/etc/uci-defaults/05-config-system- > migration | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/src/packages/fff/fff-sysupgrade/files/etc/uci- > defaults/05-config-system-migration b/src/packages/fff/fff- > sysupgrade/files/etc/uci-defaults/05-config-system-migration > index 0e36587..3b249ae 100644 > --- a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/05- > config-system-migration > +++ b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/05- > config-system-migration > @@ -6,6 +6,7 @@ UPGRADE_latitude=$(uci -q get "system.@system[0].lati > tude") > UPGRADE_longitude=$(uci -q get "system.@system[0].longitude") > UPGRADE_position_comment=$(uci -q get "system.@system[0].position_co > mment") > UPGRADE_contact=$(uci -q get "system.@system[0].contact") > +UPGRADE_hood=$(uci -q get "system.@system[0].hood") > > /bin/rm -rf /etc/config/system > > @@ -17,5 +18,6 @@ test -n "${UPGRADE_latitude}" && uci -q set "system > .@system[0].latitude=${UPGRAD > test -n "${UPGRADE_longitude}" && uci -q set "system.@system[0].long > itude=${UPGRADE_longitude}" > test -n "${UPGRADE_position_comment}" && uci -q set "system.@system[ > 0].position_comment=${UPGRADE_position_comment}" > test -n "${UPGRADE_contact}" && uci -q set "system.@system[0].contac > t=${UPGRADE_contact}" > +test -n "${UPGRADE_hood}" && uci -q set "system.@system[0].hood=${UP > GRADE_hood}" > > uci -q commit system > -- > 2.11.0 (Apple Git-81) >
Signed-off-by: Fabian Bläse <fabian@blaese.de> --- .../fff-sysupgrade/files/etc/uci-defaults/05-config-system-migration | 2 ++ 1 file changed, 2 insertions(+)