From patchwork Sat Jan 16 19:03:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nyt-openwrt@countercultured.net X-Patchwork-Id: 569054 X-Patchwork-Delegate: jow@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 56A12140B0F for ; Sun, 17 Jan 2016 06:04:11 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 2E9FE28C1A9; Sat, 16 Jan 2016 20:03:27 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id CB1EA28C185 for ; Sat, 16 Jan 2016 20:03:22 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_FROM_MX=-3.1; rate: -7.6 Received: from countercultured.net (countercultured.net [209.51.175.25]) by arrakis.dune.hu (Postfix) with SMTP for ; Sat, 16 Jan 2016 20:03:21 +0100 (CET) Received: (qmail 10699 invoked by uid 1000); 16 Jan 2016 19:03:57 -0000 From: Rob Mosher To: kaloz@openwrt.org Date: Sat, 16 Jan 2016 14:03:57 -0500 Message-Id: <1452971037-10663-1-git-send-email-nyt-openwrt@countercultured.net> X-Mailer: git-send-email 2.1.4 Cc: Rob Mosher , openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH] Fix sysupgrade overlay saving X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" A previous change to sysupgrade moved the overlay files into upper/ The -c switch generates a list of files to backup, but the sed calls did not take this into consideration. Signed-off-by: Rob Mosher --- package/base-files/files/sbin/sysupgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index ef83c4b..93f0749 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -115,6 +115,7 @@ add_overlayfiles() { local overlaydir="/overlay" fi find $overlaydir/etc/ -type f -o -type l | sed \ + -e 's,^/overlay\/upper/,/,' \ -e 's,^/overlay/,/,' \ -e '\,/META_[a-zA-Z0-9]*$,d' \ -e '\,/functions.sh$,d' \