diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-05 19:24:12 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-05 19:24:12 +0000 |
| commit | f7f0781becbf4b54263839a797847f1b0ecc8f24 (patch) | |
| tree | 29f47d5058426a16a867cbaf05109fcb7ba131d9 /package/base-files/files/sbin | |
| parent | 0e8e5d26a0ac5e766b6610e1f305a9877ee89a36 (diff) | |
[package] 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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23258 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files/sbin')
| -rwxr-xr-x | package/base-files/files/sbin/sysupgrade | 5 |
1 files changed, 3 insertions, 2 deletions
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 } |