From patchwork Wed Apr 4 23:28:23 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: 895210 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="pFu3cLUM"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tpTxxjaR"; 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 40GhxN51lbz9ry1 for ; Thu, 5 Apr 2018 09:29:12 +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=jyyDfSDT6K69ZGro52kALxaoSVK/Dz6D8ezC1WtD/Ck=; b=pFu3cLUMjtWvas XbuPHhLI4MpHfQtwIbzcNZ4VoX8w7OP79iEkiswTDZFO81rd4iXTQiBgH44iqJTXOpRpRjNynKpqX zCT0SsNayun8J5uLTPk/8fc6jcWLKGj9kMKDIUDmtWFPaIg+vao9HN2dMKjWl706TycBaesdPcG5q exWP/oUgzVDIpJte15P+dkeXzMMhBUX7TZq/2Y0IAsljk6RG2whLnfO9h5Sy8uOZlG6thiQPxlrJE D4bg9WGAy6p0EJ6BXiY/zTPrzcon/BV6NlyPru+2DRNwqj10mGMOkfrX+MdNuYjUR7iLrr8BydKve CHw+YN9JPc4+ZKGjxJTA==; 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 1f3rq1-0001Fn-UF; Wed, 04 Apr 2018 23:29:09 +0000 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f3rph-00012E-Gw for lede-dev@lists.infradead.org; Wed, 04 Apr 2018 23:28:50 +0000 Received: by mail-qk0-x244.google.com with SMTP id o64so24449784qkl.7 for ; Wed, 04 Apr 2018 16:28:38 -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=z9gDxAlYU7Sc9Rusi6QrGB+G155SjgcroQRG7/pFYqo=; b=tpTxxjaR1wDfsd9IxLYprcCBCZ7x6CfddlK+M56GolTK2wgf07XxRDpczsrURwfTwg mnIs6TPiVomnNi5n26C5n93k2cdQa470wKlwHuvPZGSkz9KYh0+uHUFfOT9VCuDe40xs TlvMsdS0Xj8hc+/KURKeOVBiQyzAtA2fSZ7twlrgyKXNFlWZeI+TGaPpvjYFC9xpYzM5 Bhs0eSPtViso5kh/h0ayUslGvPcCV4CgAur+CuRTGVlExvf7q3Cv8YDoM3GDD6Ymdm05 DiuU9zEPi88QUsHsG6nZ1aNt77qxTh26LYbfFoI8gwwGOHuHKUkVifCngsmAzhHrFLmX ZnDw== 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=z9gDxAlYU7Sc9Rusi6QrGB+G155SjgcroQRG7/pFYqo=; b=Qbwl9wVC+lXiXF/8a0aG+1bnl7bXWbG80c1EOeAOSM+BPINQw+RqRhq8YmgobM2OV8 nrCTZqe2nYagmPHcmhzz1tzkcC71Zu+upje/OcffssO6pDcVgF1wA4KDqtizfVh+5+KY 93T8IWnpYjo6nveP8ZdPthBOGfok20gopwRpFPvDhnPWfGKDAogn0mPWMsqm04IpOWT9 VGm5QTS3w1CuZi8mOZeyOl0lIc90zjqEbEvSAfg4tJCF1j1t9tNvbWhmi/7wpZtLHvzx hthbtaAbWwIT/+N/9i5l/qL5M63MwL2LSpadUAvsG/7LxAK3MeDIJdSjuujGgmaRmsI0 JLVQ== X-Gm-Message-State: ALQs6tCfYVbDWxiIotGHJbj2SF9Va1TkEHIHcg4rXBjf3O0cKvbNIcQ5 L0SrdrtaIRcDPRW7FL/wZfw= X-Google-Smtp-Source: AIpwx4+trSBEpUUrqFqbiuKhObDrGyfeLaVblvFR97w9MkvGwhBU8Ll95xuWD92nYuYsoE+FybXb9A== X-Received: by 10.55.168.212 with SMTP id r203mr26083548qke.154.1522884518037; Wed, 04 Apr 2018 16:28:38 -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.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Apr 2018 16:28:37 -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:23 -0300 Message-Id: <20180404232826.10815-2-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_162849_565081_44DB6AD4 X-CRM114-Status: UNSURE ( 9.41 ) X-CRM114-Notice: Please train this message. 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 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400d:c09:0:0:0:244 listed in] [list.dnswl.org] 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 1/4] base-files: minor cleanups on sysupgrade 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 Renamed add_uci_conffiles to add_conffiles as it includes any conffiles listed, not only UCI ones. Make do_save_conffiles arg mandatory Allow other options after -l (like -c) Signed-off-by: Luiz Angelo Daros de Luca --- package/base-files/files/sbin/sysupgrade | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index bf5428af25..46e46c3342 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -30,7 +30,7 @@ while [ -n "$1" ]; do -p) export SAVE_PARTITIONS=0;; -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; break;; + -l|--list-backup) export CONF_BACKUP_LIST=1;; -f) export CONF_IMAGE="$2"; shift;; -F|--force) export FORCE=1;; -T|--test) export TEST=1;; @@ -49,10 +49,10 @@ export CONF_TAR=/tmp/sysupgrade.tgz IMAGE="$1" -[ -z "$IMAGE" -a -z "$NEED_IMAGE" -o $HELP -gt 0 ] && { +[ -z "$IMAGE" -a -z "$NEED_IMAGE" -a $CONF_BACKUP_LIST -eq 0 -o $HELP -gt 0 ] && { cat <...] - $0 [-q] [-i] + $0 [-q] [-i] [-c] upgrade-option: -f restore configuration from .tar.gz (file or url) @@ -115,7 +115,7 @@ list_changed_conffiles() { done } -add_uci_conffiles() { +add_conffiles() { local file="$1" ( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \ /etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \ @@ -131,6 +131,7 @@ add_overlayfiles() { -e '\,/META_[a-zA-Z0-9]*$,d' \ -e '\,/functions.sh$,d' \ -e '\,/[^/]*-opkg$,d' \ + -e '\,/etc/urandom.seed$,d' \ > "$file" return 0 } @@ -146,13 +147,13 @@ if [ $SAVE_OVERLAY = 1 ]; then } sysupgrade_init_conffiles="add_overlayfiles" else - sysupgrade_init_conffiles="add_uci_conffiles" + sysupgrade_init_conffiles="add_conffiles" fi include /lib/upgrade do_save_conffiles() { - local conf_tar="${1:-$CONF_TAR}" + local conf_tar="$1" [ -z "$(rootfs_type)" ] && { echo "Cannot save config while running from ramdisk." @@ -247,7 +248,7 @@ if [ -n "$CONF_IMAGE" ]; then get_image "$CONF_IMAGE" "cat" > "$CONF_TAR" export SAVE_CONFIG=1 elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then - [ $TEST -eq 1 ] || do_save_conffiles + [ $TEST -eq 1 ] || do_save_conffiles "$CONF_TAR" export SAVE_CONFIG=1 else [ $TEST -eq 1 ] || rm -f "$CONF_TAR" 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() { 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: 895217 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="nLNfGbmk"; 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 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 40Ghyc52NYz9ry1 for ; Thu, 5 Apr 2018 09:30:16 +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=mE4gw+5A4ABxJFC+sz00CuFuKJipmqRAPBsRjMFz1Ik=; b=nLNfGbmksmMC7M 5FZkGyHGei1JHdrXGmP6myc74pQJD6op2QkFphLBjYFzXVCXXZg08WniDxxtsaNgh1S7Cn1zgZqP4 IuFSwXMCF6HjQYvsnvBbdsstRGLzNz+CXy7raoretNq0sLEm9ORDGrk9S/SlCzlWfmCvwoMnmjCWH wLe+GPj+Bu0AkgJnFIFJcYsZENPB30bPJvkGG/8N6su6NHnwBsg2bIVUgPBCMTEoVbZ+zeQilpfts 2vRd53yiBqKMhCyiegOnu+AcenLZNp56hEPuiBfZjz4+vwWXKoSCKll55iHtQTPB8FfBlt+izhY/f klWb4ZxZcA7qdVu5q7bQ==; 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 1f3rr3-0003As-KL; Wed, 04 Apr 2018 23:30:13 +0000 Received: from mail-qk0-x22c.google.com ([2607:f8b0:400d:c09::22c]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f3rpk-00012i-Sl for lede-dev@lists.infradead.org; Wed, 04 Apr 2018 23:28:54 +0000 Received: by mail-qk0-x22c.google.com with SMTP id v2so24455492qkh.10 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=raQ6b+truVyhcQ4ck82Xc6KfwqL1zFH3Pv6s94pV04QU3S5BrJ22cTcngQdMu3FSeg l5VcRGIH5QwcseTLdWB5/lt025PIAsBPjG83M9Lsb3zRKcEgAqTuB6dqM9t1n9DXjcMv 2yGgdCKj+9nuyGyrl/N6btfRYP4TkaejZayfpZ9u+plp+2g+ZFvddg93wfrlzyYQkHGw u9Gpqp49ouZ6kGYIaoE+vAejgMZtZeV1pwoifad7wh2QBRnQIsR32EoWbjVqIuszmR/1 RCVntEaP92w7DH3m0ZqMs0AZakIFOlamNaEcOx7kHfYrxfMWHo0pCuIqaUWRb+QJxkl/ suCA== X-Gm-Message-State: ALQs6tA9xnNYrasNbw7H4hRR37FgEsLB+yiBXlKSu6TVUSqVIMzlF3ii mpl12dNIW0hbqlLCNsylOLw= 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180404_162852_957384_79F39F34 X-CRM114-Status: GOOD ( 11.56 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:400d:c09:0:0:0:22c 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 3/4] base-files: add sysupgrade -o to save all overlay 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 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 } From patchwork Wed Apr 4 23:28:26 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: 895212 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="jv3rIjjX"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CDq1Kw4s"; 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 40Ghxk6d60z9s0W for ; Thu, 5 Apr 2018 09:29:30 +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=AeGfJAu1Zv0TBMirgPLvaxNkyA/yC+49cK3ggq4G1pk=; b=jv3rIjjX7Nn3je w4EvWpNEoJ2pA/SIm5aPEQAW7J7qNTpvmwmuCk+eK0qnAa8s+WPtOjaJ60qwKU8nG+uDh1WvghF5h G4U46SINqovxakpQ8TiBm2484/ScZw08UwJ2iAXmCO5ZK9OB3ELhsgPvKsJ4ae8DItR4s7BskIlFx PUNqfSSZGJt7e7IqoPmgf8eVx3adzJWrgzn8fzBd5SiSuk8Tj0c6/hgHW5mMXxBnx0WsyksaMH0FM oFcobVZo/GTPmbF4H3OYUYqHyJnxB73HL2q9l21UN79BsdPUX1ZBZb/UVMeu6qS2xAw1m/u2lGuDB 4J+VrE+pomjSKJW6cEoQ==; 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 1f3rqL-0001Uz-0e; Wed, 04 Apr 2018 23:29:29 +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-00012m-2j for lede-dev@lists.infradead.org; Wed, 04 Apr 2018 23:28:52 +0000 Received: by mail-qk0-x243.google.com with SMTP id b198so24439678qkg.9 for ; Wed, 04 Apr 2018 16:28:44 -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=X/4mz6LYQyCvAH5sw8Chht8yYTZ/eRasKScCnrU5P3Q=; b=CDq1Kw4sDJL0Tac3lCCSrnxYNySsriHrkzpa/NRgaFmyv6XaL8tTM8I6M+XWWaoHBV +JeOv1j2VBHANrRZ+ezE6pFgw6oNfAXIKIliXYvKrul7LdITna1fInTZ4rMUgoyWSSmp xr+6AClMVjg6tnBiHaLtDaAOXfWLBxbelan5o+lHFMj/Jext9j921Jnd0x6LivMjMmGg 2KPXGieE2vbpV0PtR1/mI+XHydmDZNVTTq/iEc1Xt8mYxAfMlvTt0k++vxgsAevZ4v8J Q79QEm5S9Wrpfku9pjvJRt9fd3Tau7bmKdQCobgzghPNZ+DeXwkk78yrixaZpM86VjCJ BsJg== 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=X/4mz6LYQyCvAH5sw8Chht8yYTZ/eRasKScCnrU5P3Q=; b=VM6QUFAea34nkoXeBVkjSZNtOVJ6oehqgze4Fd8h5rE8mGXcTs8afqjui80+xOfFej 1Wk8RQmk1Lj1130TE4oH7RwinbFGJw1QKjoJw4tsq8dTJNbyoXnkd6qY4iE0GmZTT60s AAUpWqTWOqHxzTYSiGbmPC8RLF2NdocYftt3E34S7BbYvZkKdPEd5oFf48sxAn5XJdE8 ne8vQOD9HPZMVHMMSWu7l9FO2uFUV1rOHtmLrfMxbhKzLx+B/zEY/Dblbd+R7k2BrcZr B9GOpnAiIZ+C9m0un+e/bS5dPUy6sZaXr/ry2QhKtxGrg1Y6MzOVE5F5gZ5tRmiS2g99 2jDg== X-Gm-Message-State: ALQs6tAHYASZfgG136JauxIh17lRf2OufR0sQA2ZnmjfPyp0WRAjZwo/ MmjfrufaF46uwRydWjU/Md0= X-Google-Smtp-Source: AIpwx4+Ez+adhjzh4KvD840370oVTl243nMiWwaEzdxFRLEggIa7fneozHi5agdxMjDtjF7Kep0Pdg== X-Received: by 10.55.78.86 with SMTP id c83mr27231078qkb.264.1522884523366; Wed, 04 Apr 2018 16:28:43 -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.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Apr 2018 16:28:42 -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:26 -0300 Message-Id: <20180404232826.10815-5-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_141179_FBD0F79F X-CRM114-Status: GOOD ( 11.03 ) 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 4/4] base-files: add sysupgrade -k to save list of pkgs 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 When '-k' is used, sysupgrade inserts into backup a new file /etc/sysupgrade.installed which contains pkgname and origin (rom, overlay, unknown). It's maily used to reinstall all extra packages: # opkg update # grep "\toverlay" etc/sysupgrade.installed | cut -f1 | xargs opkg install # rm etc/sysupgrade.installed Signed-off-by: Luiz Angelo Daros de Luca --- package/base-files/files/sbin/sysupgrade | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 01a942bac6..c5067a757b 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -11,6 +11,7 @@ export SAVE_CONFIG=1 export SAVE_OVERLAY=0 export SAVE_OVERLAY_PATH= export SAVE_PARTITIONS=1 +export SAVE_INSTALLED_PKGS=0 export SKIP_UNCHANGED=0 export CONF_IMAGE= export CONF_BACKUP_LIST=0 @@ -31,6 +32,7 @@ while [ -n "$1" ]; do -c) export SAVE_OVERLAY=1 SAVE_OVERLAY_PATH=/etc;; -o) export SAVE_OVERLAY=1 SAVE_OVERLAY_PATH=/;; -p) export SAVE_PARTITIONS=0;; + -k) export SAVE_INSTALLED_PKGS=1;; -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;; @@ -50,6 +52,7 @@ done export CONFFILES=/tmp/sysupgrade.conffiles export CONF_TAR=/tmp/sysupgrade.tgz +export INSTALLED_PACKAGES=/etc/sysupgrade.installed IMAGE="$1" @@ -67,6 +70,8 @@ upgrade-option: -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. + -k include in backup a list of current installed packages at + $INSTALLED_PACKAGES -T | --test Verify image and config .tar.gz but do not actually flash. -F | --force @@ -203,6 +208,15 @@ fi include /lib/upgrade +targz_append() { + local tar="$1" + local append_tar="$2" + ( gunzip -c "$tar" | head -c -1024; + gunzip -c $append_tar + ) | gzip > $tar.new + mv -f $tar.new $tar +} + do_save_conffiles() { local conf_tar="$1" @@ -219,6 +233,22 @@ do_save_conffiles() { [ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V="" tar c${TAR_V}zf "$conf_tar" -T "$CONFFILES" 2>/dev/null + if [ "$SAVE_INSTALLED_PKGS" -eq 1 ]; then + mkdir -p /tmp/etc + cd /tmp/ + + # Format: pkg-name{rom,overlay,unkown} + # rom is used for pkgs in /rom, even if updated later + find /usr/lib/opkg/info -name "*.control" \( \ + \( -exec test -f /rom/{} \; -exec echo {} rom \; \) -o \ + \( -exec test -f /overlay/upper/{} \; -exec echo {} overlay \; \) -o \ + \( -exec echo {} unknown \; \) \ + \) | sed -e 's,.*/,,;s/\.control /\t/' > ${INSTALLED_PACKAGES:1} + + tar c${TAR_V}zf sysupgrade.installed.packages.tgz ${INSTALLED_PACKAGES:1} + targz_append "$conf_tar" sysupgrade.installed.packages.tgz + rm -f sysupgrade.installed.packages.tgz ${INSTALLED_PACKAGES:1} + fi rm -f "$CONFFILES" }