From b04b2a74781c996a550632cccb0c627eb5d7092f Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Tue, 2 Jul 2019 13:04:31 +0200
Subject: [PATCH] build_patches: Remove additional config files preserved
during upgrade
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
OpenWrt saves additional config (and other) files included with
list_changed_conffiles in /sbin/sysupgrade.
This is only active since openwrt-18.06, since before that it was
suppressed by missing opkg.
Since we expect to only save what is in sysupgrade.conf, remove the
additional file list (and thus regain pre-openwrt-18.06
behavior).
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Fabian Bläse <fabian@blaese.de>
---
...e-OpenWrt-config-migration-mechanisms.patch} | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
rename build_patches/openwrt/{0001-sysupgrade-no-config-save.patch => 0001-Disable-OpenWrt-config-migration-mechanisms.patch} (59%)
diff --git a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch b/build_patches/openwrt/0001-Disable-OpenWrt-config-migration-mechanisms.patch
similarity index 59%
rename from build_patches/openwrt/0001-sysupgrade-no-config-save.patch
rename to build_patches/openwrt/0001-Disable-OpenWrt-config-migration-mechanisms.patch
index 1ab8987b..884cf953 100644
--- a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch
+++ b/build_patches/openwrt/0001-Disable-OpenWrt-config-migration-mechanisms.patch
@@ -1,25 +1,26 @@
-From e4ad344db97df356e178963cad6e517e2df92709 Mon Sep 17 00:00:00 2001
From: Tim Niemeyer <tim@tn-x.org>
Date: Sat, 8 Jul 2017 10:46:59 +0200
-Subject: [PATCH 1/4] sysupgrade no config save
+Subject: Disable OpenWrt config migration mechanisms
----
- package/base-files/files/sbin/sysupgrade | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+This disables all OpenWrt config migration mechanisms except for
+files listed in /etc/sysupgrade.conf
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
-index b75bd097f3..ddcfcd74e4 100755
+index b75bd097f3..8ad778fd69 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
-@@ -118,7 +118,7 @@ list_changed_conffiles() {
+@@ -118,9 +118,9 @@ list_changed_conffiles() {
add_uci_conffiles() {
local file="$1"
( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
- /etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
+ /etc/sysupgrade.conf 2>/dev/null) \
-type f -o -type l 2>/dev/null;
- list_changed_conffiles ) | sort -u > "$file"
+- list_changed_conffiles ) | sort -u > "$file"
++ ) | sort -u > "$file"
return 0
+ }
+
--
2.11.0
--
GitLab