From patchwork Wed Apr 4 23:28:24 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: 895215 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=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="YfM4XxnX"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tSx0Ntq9"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Ghy663w6z9s0W for ; Thu, 5 Apr 2018 09:29:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=trHtxhS86DWkLA7yOov8pE5TtG0ssLwCGpaRCP+obh8=; b=YfM4XxnXaVr+Ng jKNf7A8qZwRYQrS9I2pH5HpFsK7j5s0u77MEuVI6NBCF0Jbjz+rsMj81qoa/WpEAjwUXaavWmhVP3 Cbh53CtXg0s2EncFNUIckbHVnBM1rfsiragmQ0XKNXbpdBEWSxIUZPviWdw+O5B0U1LySE8UJUTB4 f62hY0Gl8jWgGCeegLDDdxeHMMJQPk+vDdM9sFoJoXp5R/C0mEJiqJs7BJIA5vHY4FsMQTx1/rEgh Bqv5OFUjqLE2aUkuWDExj0aZ+G/eC2yq9kkVDu8ez/EHOh0qOQfRCwLjfpJtgJNRGVS5w6WeyiieU g69Qs71nnhpj+gosNm2g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f3rqe-0001jD-0g; Wed, 04 Apr 2018 23:29:48 +0000 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f3rpj-00012Z-3G for lede-dev@lists.infradead.org; Wed, 04 Apr 2018 23:28:52 +0000 Received: by mail-qk0-x243.google.com with SMTP id v2so24455425qkh.10 for ; Wed, 04 Apr 2018 16:28:40 -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=rFusgNfTIEUMj2zlZB8qk0i1/WBV8GPdMFtd71dtU9Q=; b=tSx0Ntq9HzyPMxwnj0RrTUni3I/rcBGAF5H3jdM7rEHdK+zpsAImTM5HGxsMsNl7Ab sc84Tt/DjBmdbuS0t7PwdOxiR16r+vn+oVaj4wHpjtoNTuPD+Blpa4352NIdqJlZprFg X54v2B5jEqKWiabpfxLwQWBDlXUgAGzf4MsnXfP8R+FGsQc6C2nG2C8WX/EL7+tLOf/N eo8g8ss6WUwZfsz9CBB45B72YaTnmc7giuqo6nAg7+Wmd+ovLVgZ3yA20QgcDlJDrt48 oEGKhj7tH2APQ2ImeQqwkMIG6KgWMDzJ6Zk0NHClzpmuZwHbh7iYbhmh+reyDdANm40d QW3w== 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=rFusgNfTIEUMj2zlZB8qk0i1/WBV8GPdMFtd71dtU9Q=; b=Gf9rJEJ0Do1ZwA2md4wbTi/yL360WFf9hLyVc/RuYXFKPKK7VXJS6t+ijNXP40y5S/ EHdqYoGr32+bnERaJ3wbPKK841C3Ashs/DMtGUm6Sefh1T5OPDJO+gJzHMI8EOwFPZFy HMNwJn2gp5wD7pl/l13LwZw3h5lh2SOzd5otMKE5uaXhIG3wzPC+lKcWnOxOS7fLeP3l VSTmncd4bclN+f2/8D5EUa3ULQq4VvkMWpgBFbCS0nsLE6Z2cfa5hhCc6MO8KgeD+r+D +l6ou7dow8qh/lNEw8gFzmvIGmJ1lVLEG2/cdXQuNN/4CvsfqvVHaf/G/VpQ7bSztoAh yhfA== X-Gm-Message-State: ALQs6tAwxHreWiIKsYY5sYFuPeLQ5yXFWFlvti1EIRzftls0Nses2Ycz qoZZP1ciuMEiKxt4aR+nPyVbJQ== X-Google-Smtp-Source: AIpwx4+J+YebuBEzR/uschas8nHMEV/zwGuQ98n39m1tgkN3u8Nmpe3kzKTMLzpQILeOtdox/OBTxQ== X-Received: by 10.55.217.77 with SMTP id u74mr26971054qki.148.1522884519791; Wed, 04 Apr 2018 16:28:39 -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.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Apr 2018 16:28:39 -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:24 -0300 Message-Id: <20180404232826.10815-3-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180404_162851_172263_214DA65F X-CRM114-Status: GOOD ( 12.91 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400d:c09:0:0:0:243 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (luizluca[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH v2 2/4] base-files: add sysupgrade -u to skip unchanged files X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luiz Angelo Daros de Luca MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org With '-u', for a file /aaa/bbb/ccc enlisted for backup, it will only get into backup if /rom/aaa/bbb/ccc does not exist or /aaa/bbb/ccc is different from /rom/aaa/bbb/ccc. It also works with '-c', but only effective for files touched but not modified. Signed-off-by: Luiz Angelo Daros de Luca --- package/base-files/files/sbin/sysupgrade | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 46e46c3342..4d221ef5d6 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -10,6 +10,7 @@ export VERBOSE=1 export SAVE_CONFIG=1 export SAVE_OVERLAY=0 export SAVE_PARTITIONS=1 +export SKIP_UNCHANGED=0 export CONF_IMAGE= export CONF_BACKUP_LIST=0 export CONF_BACKUP= @@ -28,6 +29,7 @@ while [ -n "$1" ]; do -n) export SAVE_CONFIG=0;; -c) export SAVE_OVERLAY=1;; -p) export SAVE_PARTITIONS=0;; + -u) export SKIP_UNCHANGED=1;; -b|--create-backup) export CONF_BACKUP="$2" NEED_IMAGE=1; shift;; -r|--restore-backup) export CONF_RESTORE="$2" NEED_IMAGE=1; shift;; -l|--list-backup) export CONF_BACKUP_LIST=1;; @@ -52,12 +54,13 @@ IMAGE="$1" [ -z "$IMAGE" -a -z "$NEED_IMAGE" -a $CONF_BACKUP_LIST -eq 0 -o $HELP -gt 0 ] && { cat <...] - $0 [-q] [-i] [-c] + $0 [-q] [-i] [-c] [-u] upgrade-option: -f restore configuration from .tar.gz (file or url) -i interactive mode -c attempt to preserve all changed files in /etc/ + -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. -T | --test @@ -119,20 +122,19 @@ add_conffiles() { local file="$1" ( 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; + \( -type f -o -type l \) $find_filter 2>/dev/null; list_changed_conffiles ) | sort -u > "$file" return 0 } add_overlayfiles() { local file="$1" - find /overlay/upper/etc/ -type f -o -type l | sed \ - -e 's,^/overlay\/upper/,/,' \ - -e '\,/META_[a-zA-Z0-9]*$,d' \ - -e '\,/functions.sh$,d' \ + ( cd /overlay/upper/; find ./etc \( -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 '\,^/etc/urandom.seed$,d' \ + )> "$file" return 0 } @@ -150,6 +152,15 @@ else sysupgrade_init_conffiles="add_conffiles" fi +find_filter="" +if [ $SKIP_UNCHANGED = 1 ]; then + [ ! -d /rom/ ] && { + echo "'/rom/' is required by '-u'" + exit 1 + } + find_filter='( ( -exec test -e /rom/{} ; -exec cmp -s /{} /rom/{} ; ) -o -print )' +fi + include /lib/upgrade do_save_conffiles() {