From d80f82d7a4cbf6d5c7dbabe5ac493a8e3e5665c0 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 5 Oct 2010 19:24:12 +0000 Subject: base-files: - add sysupgrade support for keepfile hints * introduces /lib/upgrade/keep.d/ for per-package keepfile lists * introduces /etc/sysupgrade.conf for user defined keepfile hints - prime /lib/upgrade/keep.d/base-files-essential to keep sysupgrade usable for images without opkg - change sysupgrade to build the keepfile list from /lib/upgrade/keep.d/, /etc/sysupgrade.conf and opkg list-changed-conffiles SVN-Revision: 23258 --- package/base-files/files/sbin/sysupgrade | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package/base-files/files/sbin') diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 1210e6e509..3d76bb3a0e 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -55,8 +55,9 @@ EOF add_uci_conffiles() { local file="$1" - ( find /etc/config /etc/passwd /etc/group /etc/dropbear \ - /etc/firewall.user /etc/rc.local -type f; + ( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \ + /etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \ + -type f 2>/dev/null; opkg list-changed-conffiles ) | sort -u > "$file" return 0 } -- cgit v1.2.3