From: John Crispin <john@openwrt.org>
Date: Mon, 6 Oct 2014 04:51:56 +0000 (+0000)
Subject: sysupgrade: preserve symlinks in backups
X-Git-Tag: v19.07.0-rc1~16407
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7860c9707a386c5a6181937d47a4ef6faed93de9;p=openwrt%2Fstaging%2Fhauke.git

sysupgrade: preserve symlinks in backups

Signed-off-by: Catalin Patulea <catalinp@google.com>

SVN-Revision: 42783
---

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 1ec02c729a..6e63783e0a 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -102,14 +102,14 @@ add_uci_conffiles() {
 	local file="$1"
 	( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
 		/etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
-		-type f 2>/dev/null;
+		-type f -o -type l 2>/dev/null;
 	  opkg list-changed-conffiles ) | sort -u > "$file"
 	return 0
 }
 
 add_overlayfiles() {
 	local file="$1"
-	find /overlay/etc/ -type f | sed \
+	find /overlay/etc/ -type f -o -type l | sed \
 		-e 's,^/overlay/,/,' \
 		-e '\,/META_[a-zA-Z0-9]*$,d' \
 		-e '\,/functions.sh$,d' \