From patchwork Wed Apr 4 23:28:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Angelo Daros de Luca X-Patchwork-Id: 895213 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (helo) smtp.helo=arrakis.dune.hu (client-ip=78.24.191.176; helo=arrakis.dune.hu; envelope-from=openwrt-devel-bounces@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PMkW2WeH"; dkim-atps=neutral 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 40Ghxn1fbrz9ry1 for ; Thu, 5 Apr 2018 09:29:33 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1F17CB914A3; Thu, 5 Apr 2018 01:28:50 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Thu, 5 Apr 2018 01:28:50 +0200 (CEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 2DA36B91480 for ; Thu, 5 Apr 2018 01:28:43 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-qk0-f169.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -7 Received: from mail-qk0-f169.google.com (mail-qk0-f169.google.com [209.85.220.169]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 5 Apr 2018 01:28:42 +0200 (CEST) Received: by mail-qk0-f169.google.com with SMTP id c188so24454056qkg.2 for ; Wed, 04 Apr 2018 16:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G7SCLG/RJFm8Yacaz4EUfxl1TM8orL4JWJaNFdrlztc=; b=PMkW2WeHVCmsBwBr9wH7qj52zoUacOy/yNbcAtjo8NpUaBK/GBRe23dPOc36/qs3aY cSQDrIp9EKEIbmiFR42wtWSXBTdQQKA4/WFZyhTuS7FMElP6KICu76+ACzJck3HitN4E /XCHpLMnmh5AqjrMbVpeh9fdzR4LYYTzTjOI39iV6KI7xyWyoqZqn878uJfw/FWl733Q DQcM3SBagrz2YP6JW6/y9gqEa3mxaIG5turXpYphsn0GUcejFk43pL5ksWb/3zPaXshr V9+JIzoi4yAg9AgncjZlX4Lco+KbFUKM8jvV/YOYlgguwNW0rX//Ik5f7bMGaTj59t4A kpxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G7SCLG/RJFm8Yacaz4EUfxl1TM8orL4JWJaNFdrlztc=; b=C/NgOztECqtTdoQfHqZLepHr2p4dUfwQ8HTdGRJsf1bhIEEeHzJxSvDis8ZaMcxUWX cKziCGSaPHLI8AF1ZspG0SLJe63sjDIGoIN+Lk3XU5grkJhCxoiB9Wz2NKyCd1n4VEJk C7mIwiX6PEmCpDnZHYLH3PHUpOWnwxYkVeBLhzhmF7gSi/7ZMIkTJN6Fdq//2j7wz5bF spimpVTpXkjOK4kKUV4BFGgexdcQctLXcS72hG1nMHglAyraxise+6E3GpzQHMdCcCcf E9LNzmxBovhTPBOD2q60HciHwcXbkSCqie1g8/zq8cSo4dVBmFVrnIPORyVJ3eZlb7cw fppQ== X-Gm-Message-State: ALQs6tBpVAZXyMg2c6qq5CefNOH5gbzBuEkxqV0HRivbmccAsi2oYuAU RcLi+z6xpwfUmvnY4OSvKDT8TQ== X-Google-Smtp-Source: AIpwx485SAFBe7Af2RtHufum4bU3f/+YZPmKQWvv5JepiWOqrAhs/dX1tAEh0mAkux8e3ZeXmoYpXg== X-Received: by 10.55.7.18 with SMTP id 18mr27503426qkh.249.1522884521558; Wed, 04 Apr 2018 16:28:41 -0700 (PDT) Received: from tresc043793.redetresc.tre-sc.gov.br ([201.55.123.206]) by smtp.gmail.com with ESMTPSA id z7sm5149132qke.19.2018.04.04.16.28.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Apr 2018 16:28:41 -0700 (PDT) From: Luiz Angelo Daros de Luca To: openwrt-devel@lists.openwrt.org, lede-dev@lists.infradead.org Date: Wed, 4 Apr 2018 20:28:25 -0300 Message-Id: <20180404232826.10815-4-luizluca@gmail.com> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180404232826.10815-1-luizluca@gmail.com> References: <20171117004110.23143-1-luizluca@gmail.com> <20180404232826.10815-1-luizluca@gmail.com> Subject: [OpenWrt-Devel] [PATCH v2 3/4] base-files: add sysupgrade -o to save all overlay files X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 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" Add sysupgrade '-o' option in order to include all overlay files in backup, except for those that are from packages but including files listed in conffiles, sysupgrade.conf or /lib/upgrade/keep.d. With '-u' option, it will skip files equals to /rom and conffiles that were not changed. Signed-off-by: Luiz Angelo Daros de Luca --- package/base-files/files/sbin/sysupgrade | 46 +++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 4d221ef5d6..01a942bac6 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -9,6 +9,7 @@ export INTERACTIVE=0 export VERBOSE=1 export SAVE_CONFIG=1 export SAVE_OVERLAY=0 +export SAVE_OVERLAY_PATH= export SAVE_PARTITIONS=1 export SKIP_UNCHANGED=0 export CONF_IMAGE= @@ -27,7 +28,8 @@ while [ -n "$1" ]; do -v) export VERBOSE="$(($VERBOSE + 1))";; -q) export VERBOSE="$(($VERBOSE - 1))";; -n) export SAVE_CONFIG=0;; - -c) export SAVE_OVERLAY=1;; + -c) export SAVE_OVERLAY=1 SAVE_OVERLAY_PATH=/etc;; + -o) export SAVE_OVERLAY=1 SAVE_OVERLAY_PATH=/;; -p) export SAVE_PARTITIONS=0;; -u) export SKIP_UNCHANGED=1;; -b|--create-backup) export CONF_BACKUP="$2" NEED_IMAGE=1; shift;; @@ -60,6 +62,8 @@ upgrade-option: -f restore configuration from .tar.gz (file or url) -i interactive mode -c attempt to preserve all changed files in /etc/ + -o attempt to preserve all changed files in /, exept those + from packages but including changed confs. -u skip from backup files that are equals to those in /rom -n do not save configuration over reflash -p do not attempt to restore the partition table after flash. @@ -129,12 +133,48 @@ add_conffiles() { add_overlayfiles() { local file="$1" - ( cd /overlay/upper/; find ./etc \( -type f -o -type l \) $find_filter | sed \ + + local packagesfiles=$1.packagesfiles + touch "$packagesfiles" + + if [ "$SAVE_OVERLAY_PATH" = / ]; then + local conffiles=$1.conffiles + local keepfiles=$1.keepfiles + + list_conffiles | cut -f2 -d ' ' | sort -u > "$conffiles" + + # backup files from /etc/sysupgrade.conf and /lib/upgrade/keep.d, but + # ignore those aready controlled by opkg conffiles + find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \ + /etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \ + \( -type f -o -type l \) 2>/dev/null | sort -u | + grep -h -v -x -F -f $conffiles > "$keepfiles" + + # backup conffiles, but only those changed if '-u' + [ $SKIP_UNCHANGED = 1 ] && + list_changed_conffiles | sort -u > "$conffiles" + + # do not backup files from packages, except those listed + # in conffiles and keep.d + find /usr/lib/opkg/info -type f -name "*.list" | sort -u | + xargs -r grep -h -v -x -F -f $conffiles | + grep -v -x -F -f $keepfiles > "$packagesfiles" + rm -f "$keepfiles" "$conffiles" + fi + + # busybox grep bug when file is empty + [ -s "$packagesfiles" ] || echo > $packagesfiles + + ( cd /overlay/upper/; find .$SAVE_OVERLAY_PATH \( -type f -o -type l \) $find_filter | sed \ -e 's,^\.,,' \ -e '\,^/etc/board.json$,d' \ -e '\,/[^/]*-opkg$,d' \ -e '\,^/etc/urandom.seed$,d' \ - )> "$file" + -e '\,^/usr/lib/opkg/.*,d' \ + ) | grep -v -x -F -f $packagesfiles > "$file" + + rm -f "$packagesfiles" + return 0 }