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" }