forked from freifunk-franken/firmware
Adrian Schmutzler
225116dfd2
Bump main repo, packages and routing repos. Refresh patches, drop upstreamed ones. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Reviewed-by: Fabian Bläse <fabian@blaese.de>
24 lines
895 B
Diff
24 lines
895 B
Diff
From: Tim Niemeyer <tim@tn-x.org>
|
|
Date: Sat, 8 Jul 2017 10:46:59 +0200
|
|
Subject: Disable OpenWrt config migration mechanisms
|
|
|
|
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 6c518b780eddd973966537b50d8f7c82539bb1e1..49d4514b988e827098450d57da0ae50a37506d3a 100755
|
|
--- a/package/base-files/files/sbin/sysupgrade
|
|
+++ b/package/base-files/files/sbin/sysupgrade
|
|
@@ -134,9 +134,9 @@ list_changed_conffiles() {
|
|
add_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 \) $find_filter 2>/dev/null;
|
|
- list_changed_conffiles ) | sort -u > "$file"
|
|
+ ) | sort -u > "$file"
|
|
return 0
|
|
}
|
|
|