diff mbox series

[2/4] kirkwood: fix sysupgrade experience for early DSA-adopters

Message ID 20200806141241.34383-2-freifunk@adrianschmutzler.de
State Accepted
Delegated to: Adrian Schmutzler
Headers show
Series [1/4] mvebu: fix sysupgrade experience for early DSA-adopters | expand

Commit Message

Adrian Schmutzler Aug. 6, 2020, 2:12 p.m. UTC
Conceptually, the compat-version during sysupgrade is meant to
describe the config. Therefore, if somebody starts with a device on
19.07 and swconfig, and that person does a forceful upgrade into a
DSA-based firmware without wiping his/her config, then the local
compat-version should stay at 1.0 according to the config present
(and not get updated).

However, this poses a problem for those people that early-adopted
DSA in master, as they already have adjusted their config for DSA,
but it still is "1.0" as far as sysupgrade is concerned. This can
be healed by a simple

   uci set system.@system[0].compat_version="1.1"
   uci commit system

But this needs to be applied _after_ the upgrade (as the "old" fwtool
on the old installation does not know about compat_version) and it
requires access via SSH (i.e. no pure GUI solution is available for
this group of people, apart from wiping their config _again_ for
no technical reason). Despite, the situation will not become
obvious to those just upgrading via GUI, they will just have the
experience of a "broken upgrade".

This is a conflict which cannot be resolved by achieving both goals,
we have to decide to either keep the strict concept or improve the
situation for early adopters.

In this patch, we address the issue by providing a uci-defaults
script that will raise the compat_version for _all_ people upgrading
into a 1.1 image, no matter whether they have reset config or not.
The idea is implement this as a _temporary_ solution, so early
adopters can upgrade into the new mechanism without issues, and
after a few weeks/months we could remove the uci-defaults script

If we e.g. remove the script just before 20.xx.0-rc1, early adopters
should have moved on by then, and existing stable users would still
get the intended experience.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 .../etc/uci-defaults/05_fix-compat-version       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 target/linux/kirkwood/base-files/etc/uci-defaults/05_fix-compat-version
diff mbox series


diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/05_fix-compat-version b/target/linux/kirkwood/base-files/etc/uci-defaults/05_fix-compat-version
new file mode 100644
index 0000000000..d7f8488e88
--- /dev/null
+++ b/target/linux/kirkwood/base-files/etc/uci-defaults/05_fix-compat-version
@@ -0,0 +1,16 @@ 
+# Copyright (C) 2020 OpenWrt.org
+. /lib/functions.sh
+case "$(board_name)" in
+	linksys,e4200-v2|\
+	linksys,ea3500|\
+	linksys,ea4500)
+		uci set system.@system[0].compat_version="1.1"
+		uci commit system
+		;;
+exit 0