From 1e8f4e9ac4b4ac2d47ff758707bf175e15a7d38a Mon Sep 17 00:00:00 2001 From: Michal 'vorner' Vaner Date: Tue, 14 Feb 2017 14:09:32 +0100 Subject: [PATCH 1/2] migrator: Disable branch detection The detection seems to be broken and produces invalid branches. Disable it altogether, and let people configure their branch later on. This is more reliable and we have nearly no people with a branch set in the router on the old updater anyway. --- src/migrator/updater-migrate.sh | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/migrator/updater-migrate.sh b/src/migrator/updater-migrate.sh index d1b25cb8..14e68fb3 100755 --- a/src/migrator/updater-migrate.sh +++ b/src/migrator/updater-migrate.sh @@ -35,20 +35,7 @@ if grep -q -e '-- Auto-migration performed' /etc/updater/auto.lua ; then echo "Updater migration already performed" >&2 else # This script migrates from the old updater to updater-ng. First, migrate the config. - BRANCH=$(uci -q get updater.override.branch || true) - if [ -z "$BRANCH" ] ; then - BRANCH=$(grep '^src/gz.*/base$' /etc/opkg/distfeeds.conf | sed -e 's#.*openwrt-repo/##;s#/.*##') - fi - BRANCH=$(echo "$BRANCH" | sed -e 's/^omnia-//;s/^turris-//') - if [ "$BRANCH" = "turris" -o "$BRANCH" = "omnia" ] ; then - BRANCH="" - fi - if [ "$BRANCH" ] ; then - uci set updater.override=override - uci set updater.override.branch="$BRANCH" - else - uci delete updater.override.override || true - fi + uci delete updater.override.override || true uci commit updater # Clean up the auto.lua first, to get rid of any possible artifacts of -- GitLab From c734e81b95b3263abd17f668c27d17b60bf2081e Mon Sep 17 00:00:00 2001 From: Michal 'vorner' Vaner Date: Wed, 15 Feb 2017 13:51:55 +0100 Subject: [PATCH 2/2] fixup! migrator: Disable branch detection --- src/migrator/updater-migrate.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/migrator/updater-migrate.sh b/src/migrator/updater-migrate.sh index 14e68fb3..2f6bc578 100755 --- a/src/migrator/updater-migrate.sh +++ b/src/migrator/updater-migrate.sh @@ -34,10 +34,6 @@ if grep -q -e '-- Auto-migration performed' /etc/updater/auto.lua ; then echo "Updater migration already performed" | logger -t daemon.info echo "Updater migration already performed" >&2 else - # This script migrates from the old updater to updater-ng. First, migrate the config. - uci delete updater.override.override || true - uci commit updater - # Clean up the auto.lua first, to get rid of any possible artifacts of # old updater interacting with our opkg wrapper. All the relevant packages # are in the system anyway, so they'll get re-added there. -- GitLab