From patchwork Fri Aug 17 23:49:50 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: 959150 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 (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.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="bGFBzyH2"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Qc7OFFF1"; 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 41sg1q13k5z9s47 for ; Sat, 18 Aug 2018 09:50:38 +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=9SOAHUMyQIEmc6uVRAnTYCFKr3+LhTRgZ2xuNs214ME=; b=bGFBzyH2vqGcVU 4UTnjxWdzVonkU+LdFscqDIeBTAgJF5StqKg5BWq/IlJ2idwIK1p8DQqPz7OlFyxdYgjfMyU133QP nidzjpWwDwr8yjATsCeXRLMWtfTwc+7E73ZSPrU15pTML2aAhmclO82Xj6nlChAsTtTw5UgHZ1G35 NPZgdnuesGgiNFw/iyhfraE3ZTJThtSkaaTBsSQubrheZASh0fbALZwk5OOZTN6i8rDUd5nGyCVNN 0okREltdIUdp294+ElsjkETMUEEN4CTyLvglkOushyrw8y+qixMc88GzbmZ4yvekjf6nvw/2K/RYM Tghi4amORJ5VRNFsewJQ==; 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 1fqoVm-0002Sy-7T; Fri, 17 Aug 2018 23:50:34 +0000 Received: from mail-qt0-x230.google.com ([2607:f8b0:400d:c0d::230]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fqoVa-0002ES-PQ for openwrt-devel@lists.openwrt.org; Fri, 17 Aug 2018 23:50:25 +0000 Received: by mail-qt0-x230.google.com with SMTP id h4-v6so10585806qtj.7 for ; Fri, 17 Aug 2018 16:50:12 -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=8bwuM+Sj2HVRz61o9qzaEx+rmdw92y9lPUHn6a0LfkU=; b=Qc7OFFF1AbL0aJ2EIH9qRIU7IdL9rNsuiZq69zfwqu4yJaTF/y/9q3/mBrjKCCncmC vQzYQzLIhUJpMxvrO6E3Idfs1P2zGvdcLQc8kZrse+NFpvDWvmgANdtho/QTmB/2gICD Rb8nvCFYeo2w2j3IzMYuhIu50bHcblm6CWIRMGhNkpCTvasGddOYEao4At2Zyy2Yfm04 YsCCvdktHOouvNPhC1PsE3RW/DIvqgYr0fUqYbag/y0/FWqsyyu1gH428SLPxtBDvewI cYtTzvGPx7iywbZWmBkd5fAIyr/tyORZCyAp9P8DpPJi5Pzyxd4KDPQJUiIgzqpGBcKM p2DQ== 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=8bwuM+Sj2HVRz61o9qzaEx+rmdw92y9lPUHn6a0LfkU=; b=t1xmzB4wcYiv5/xWVmLL+QnECGmipHYDzuNvCmcVHO1JnIpxAs98JweIFCkaUN2xQc 7q6FCFSdESc/nzT0hEQZAu/gs1zz1aL5cn9i0uYmZIBxBJy0vaEJ1qybof8iNkbtH+kW GsyYWmVHpyfsc9y5QUe2ltsbw/ApQwiK70mJEjjzQEfagJ9Yn1QJzDOBvJvgdbA9PgT+ ahjokVGVGfCgY/+sR7mY40qCCSXk3zBxwwBNnfky8Y1eSrnCRC3JomxG5TYEofCTmngO 5dVilNxTLRBXQnLlLctOsKNwc6ATM1/KTM/igor3RfCqFZBSbiWxL6p6MZdmUsaPdyJH ggSA== X-Gm-Message-State: AOUpUlEMn3k5Aj99PEq2PiGOtTZl6zZ4+mw7mnsWeEDPYpMPyRvOa7fq eBUFVdo1oGijNhplDeVK5DI3AZBR X-Google-Smtp-Source: AA+uWPwQiw9icMAlC+AbH3ZAZcsLWhSb58MMu7K9bvjxSGYPxGGqqoOcgcRwkkIbJd7wYA+5g0zvRg== X-Received: by 2002:aed:2686:: with SMTP id q6-v6mr10691493qtd.199.1534549811139; Fri, 17 Aug 2018 16:50:11 -0700 (PDT) Received: from tresc043793.redetresc.tre-sc.gov.br (187-049-235-010.floripa.net.br. [187.49.235.10]) by smtp.gmail.com with ESMTPSA id s66-v6sm2082618qki.24.2018.08.17.16.50.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Aug 2018 16:50:10 -0700 (PDT) From: luizluca@gmail.com To: openwrt-devel@lists.openwrt.org Date: Fri, 17 Aug 2018 20:49:50 -0300 Message-Id: <20180817234953.6149-2-luizluca@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180817234953.6149-1-luizluca@gmail.com> References: <20180404232826.10815-1-luizluca@gmail.com> <20180817234953.6149-1-luizluca@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180817_165022_830930_F35A8059 X-CRM114-Status: GOOD ( 11.19 ) 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:c0d:0:0:0:230 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (luizluca[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [OpenWrt-Devel] [PATCH v3 1/4] base-files: minor cleanups on sysupgrade X-BeenThere: openwrt-devel@lists.openwrt.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: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Luiz Angelo Daros de Luca 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) Do not use stdout for error messages (fixes backup to stdout) Signed-off-by: Luiz Angelo Daros de Luca --- package/base-files/files/sbin/sysupgrade | 33 ++++++++++++------------ 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 3cebfb68e0..22e233033a 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -30,13 +30,13 @@ 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;; -h|--help) export HELP=1; break;; -*) - echo "Invalid option: $1" + echo "Invalid option: $1" >&2 exit 1 ;; *) break;; @@ -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 } @@ -140,21 +141,21 @@ sysupgrade_image_check="fwtool_check_signature fwtool_check_image platform_check if [ $SAVE_OVERLAY = 1 ]; then [ ! -d /overlay/upper/etc ] && { - echo "Cannot find '/overlay/upper/etc', required for '-c'" + echo "Cannot find '/overlay/upper/etc', required for '-c'" >&2 exit 1 } 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." + echo "Cannot save config while running from ramdisk." >&2 ask_bool 0 "Abort" && exit rm -f "$conf_tar" return 0 @@ -188,7 +189,7 @@ fi if [ -n "$CONF_RESTORE" ]; then if [ "$CONF_RESTORE" != "-" ] && [ ! -f "$CONF_RESTORE" ]; then - echo "Backup archive '$CONF_RESTORE' not found." + echo "Backup archive '$CONF_RESTORE' not found." >&2 exit 1 fi @@ -198,7 +199,7 @@ if [ -n "$CONF_RESTORE" ]; then fi type platform_check_image >/dev/null 2>/dev/null || { - echo "Firmware upgrade is not implemented for this platform." + echo "Firmware upgrade is not implemented for this platform." >&2 exit 1 } @@ -213,7 +214,7 @@ IMAGE="$(readlink -f "$IMAGE")" case "$IMAGE" in '') - echo "Image file not found." + echo "Image file not found." >&2 exit 1 ;; /tmp/*) ;; @@ -230,10 +231,10 @@ export ARGC=1 for check in $sysupgrade_image_check; do ( $check "$IMAGE" ) || { if [ $FORCE -eq 1 ]; then - echo "Image check '$check' failed but --force given - will update anyway!" + echo "Image check '$check' failed but --force given - will update anyway!" >&2 break else - echo "Image check '$check' failed." + echo "Image check '$check' failed." >&2 exit 1 fi } @@ -244,14 +245,14 @@ if [ -n "$CONF_IMAGE" ]; then # .gz files 1f8b) ;; *) - echo "Invalid config file. Please use only .tar.gz files" + echo "Invalid config file. Please use only .tar.gz files" >&2 exit 1 ;; esac 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 Fri Aug 17 23:49:51 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: 959152 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 (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.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="A7EA1QbI"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="V3E51jOO"; 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 41sg212pv2z9s47 for ; Sat, 18 Aug 2018 09:50:49 +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=HKHcD8V5a3JGQrFiufP/sA1MLQ2L3QcZzVXP396fNd4=; b=A7EA1QbIAu+E8z x+v9ZYbqpiEPsjWBi/FrYfXC/HvDgNcFqEp3SMk28sHAZAkaVzEhit6TD9xdW/alsbqLhpCNRqDpG h8XcnWjVTQccGJJhrODp7R/y4M2sYpYt8MnwKDGdZa7CSzxLBSMGMKALwjUnR+i277xqdyhsWJA8j vX2ntTHxyjANSoJmSTcEVaF+KG/O0b52cobTucXXn2C9KAfSJzKdXnXMJFp4TTyQABsDFrvRw9GHC gkCZeBTB7Y9ButJtgsal9oighRNvO44Kylix0yGVkvSsbTpqx/mELeTrJfFbUdQ42RvaEzF6kqxUS wMmcGGhPxfGpUcVcSZqw==; 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 1fqoVw-0002hy-Er; Fri, 17 Aug 2018 23:50:44 +0000 Received: from mail-qt0-x22d.google.com ([2607:f8b0:400d:c0d::22d]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fqoVc-0002ET-9N for openwrt-devel@lists.openwrt.org; Fri, 17 Aug 2018 23:50:26 +0000 Received: by mail-qt0-x22d.google.com with SMTP id r21-v6so10590398qtm.2 for ; Fri, 17 Aug 2018 16:50:13 -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=joRv3ldaff5erApwlpIpIBHHKUlrUH8TKDUT4EQ288E=; b=V3E51jOOP+dnn+On1Bk2oroF5ugvciuFO2UIUw7z7Tx62dcQ+Qm+K6anogl1+T+4sr 0PRdEetqsW8O0st7N0dhu6lpE8MDj7mAQqJzu1i/QVtsirY5foto1lcNtqiwxqw/O/tN rzbstJbhOxIvdtlneXpjuDFr5fbe9SZfBEuw38pv+/wEEaRZZeVYC6+zcmg/Jt9ui+RX o/h6IEMuF3GwPM4dojhsPu7e1fkJ/ChoeoQB4rUrXdZkYdGWhZfmN2REZ8PKNZnc7YM8 hfhWUEM/p/gPYeEOqENh6jg+wKFjmrPlLqG2ruLkCToA5xtDXe3BD+mTA2Ln5um4NLZx DXXA== 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=joRv3ldaff5erApwlpIpIBHHKUlrUH8TKDUT4EQ288E=; b=PkLb/KecqwGgpL2vbLujlh8darRf6qtaino41YAKehfi33FWrBv9ScVAXni0DAzxcJ cOcLEULqdzKfzxGa2R2VLDpIz7PHb0VnwjXzai1mV2DmJXnx1d/aLF+ibfZi/iY8us3i vmY5rk/tlYwgQEliGhoI0Hy7bwyEr+QHQ4f2oyewEGQdHcahqWr9b6/GH9cQs5ZFKGwa vTQG9vDQamJHvoqInm7HiN1TurWAhf6NS2RU8vzbg/J3rxAw24RrLC5nB+87OBZXIzq8 05ThEir1T42P0B/zXfdZbhMFDCp+wiUtL5/I3Vc+UF99g5o5kA9toxwi3+M3fClIa7Z5 WsUg== X-Gm-Message-State: AOUpUlHvXunrTPXX+94FyPuxWwkmP52295ZNGueIEHCAeMyp09I2Dj4E EAsUKobGZSHVYP2c+laUbcEQW+Or X-Google-Smtp-Source: AA+uWPzILfob8yHGq/fd5B/JuT2M9PvILB0Leuy48aZ0/+jB04cMhMvieVtOPgIc5Cq6iGIigSfSpQ== X-Received: by 2002:ac8:13c7:: with SMTP id i7-v6mr37423556qtj.134.1534549812880; Fri, 17 Aug 2018 16:50:12 -0700 (PDT) Received: from tresc043793.redetresc.tre-sc.gov.br (187-049-235-010.floripa.net.br. [187.49.235.10]) by smtp.gmail.com with ESMTPSA id s66-v6sm2082618qki.24.2018.08.17.16.50.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Aug 2018 16:50:12 -0700 (PDT) From: luizluca@gmail.com To: openwrt-devel@lists.openwrt.org Date: Fri, 17 Aug 2018 20:49:51 -0300 Message-Id: <20180817234953.6149-3-luizluca@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180817234953.6149-1-luizluca@gmail.com> References: <20180404232826.10815-1-luizluca@gmail.com> <20180817234953.6149-1-luizluca@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180817_165024_325205_94F35554 X-CRM114-Status: GOOD ( 12.24 ) 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:c0d:0:0:0:22d listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (luizluca[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [OpenWrt-Devel] [PATCH v3 2/4] base-files: add sysupgrade -u to skip unchanged files X-BeenThere: openwrt-devel@lists.openwrt.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: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Luiz Angelo Daros de Luca 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 22e233033a..45378d7266 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 } @@ -149,6 +151,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 Fri Aug 17 23:49:52 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: 959153 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 (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.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="O2NCosda"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="noY4sIT6"; 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 41sg2D0Mbnz9s8F for ; Sat, 18 Aug 2018 09:51:00 +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=TUoBwzJBV2yeDgjdr2XNgpioW24qyIWrIJYxfnrHcxE=; b=O2NCosda7+E2es V6rz+BJPIL3DxY07DZLdBNR9XIRd2JagNu9Ocw4b47WPGiGZjWctZeKxg4TlfpBF0Z+HgiEHjEIlG d6s1CTB7bfDoiuRHk/JmpKq5L85TFjCjn7m5YWINU7P48O6/+6vS8Ckt4MsUAB5DENQQLdtXTfthO s0zAxXJzPMKaix0xs8oca+Hw7iEuaZIgf4mVNQ0jAjYJ4A4d0CeomjBOkUwYML4NeETEzpHfSW9zj AAQUOlTn1ixcfkx0j0rxyNkqrIimYqSly8U2dPFbv3Tdi00MNBrBa7aU+bqrDLXrNI8mcR7mqanKp Y0zZ4/7Q/WlnLaMmz9bQ==; 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 1fqoW6-0002wd-GP; Fri, 17 Aug 2018 23:50:54 +0000 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fqoVd-0002Ea-V3 for openwrt-devel@lists.openwrt.org; Fri, 17 Aug 2018 23:50:27 +0000 Received: by mail-qt0-x243.google.com with SMTP id m13-v6so10600207qth.1 for ; Fri, 17 Aug 2018 16:50:15 -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=LPsOYZjMukbTDr9RsIhTSgteFXpupngysDiM8r4sD5U=; b=noY4sIT6RG7QmleiB75IDrxyHGFXNDfUVr8k5AFu0pOL4kbRGGOn3V0ciDMHE5rYD9 J72gDoxtmOMjpoS0fYSAitw2KV5TC255iWdDAwmTOw7NKb8uJaNe9Yn7G2jfbfdYVoLO Dm0R7OEf66cJRUK6NeziTrInzbmGA1ZI0LHtE6Ced++sXICx1pUGTnRJNqQi1PzjT4ut F1QujtB7JtZzITBeBg9V1A/Py2QlUEJwhPj5ayxpRvFUTyzaik4wScdeD1j9Tk8/aMUq AjCKDZ1LrRsu0HgqIvtBFszqRO2SYxG1bh/wtLBaU137juRKIldZIhJu4caOh96vKgB+ P0aQ== 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=LPsOYZjMukbTDr9RsIhTSgteFXpupngysDiM8r4sD5U=; b=T+vNn8aYLS8XbY/yyL+iFuyLPx06icUeNvVQEyhHDe/S/PSEQXPXwy1sFRZmJrJjoz 74xKF09RaqyZXmSSWZVgLQmvLd2si8tXTcYLOVwnkow+K90c3f4r9/scyIXyCTTGhjTo qDv+1G3MpIj6Yv+ruhU43noJLNfpYs93E6WbFEiej3J/qGq9vRjHiXfQ1Fp4ibK7MCTV R8h9daqHBnKQRYGw3gFSIkP4Orzn+jRfcVt4NNpyTRsFO4Lrh8HnKAG6d4EthVTFDQzC lIxWDCbKA0q/N3Fxc2xLTediNYdDXt+PFCCMkpuUZVkJI4wWhVRF4SbfjqmBVOUGVPI2 JyIg== X-Gm-Message-State: AOUpUlFleaIKJFcxRY9O6BCQyGwyVSUAdPHOnYeKFvGeVsNSUpJOgL2z XLkm+MiB5Na0CKsswIMcN7pVdAcu X-Google-Smtp-Source: AA+uWPxr3Eu+Y7UShqQTccEnSfnFt7b2Gohl2qU4087l3RAZ4BPuDW4mtFdFcUvYXn3Orpa6q3YmXA== X-Received: by 2002:a0c:9281:: with SMTP id b1-v6mr33206544qvb.115.1534549814537; Fri, 17 Aug 2018 16:50:14 -0700 (PDT) Received: from tresc043793.redetresc.tre-sc.gov.br (187-049-235-010.floripa.net.br. [187.49.235.10]) by smtp.gmail.com with ESMTPSA id s66-v6sm2082618qki.24.2018.08.17.16.50.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Aug 2018 16:50:14 -0700 (PDT) From: luizluca@gmail.com To: openwrt-devel@lists.openwrt.org Date: Fri, 17 Aug 2018 20:49:52 -0300 Message-Id: <20180817234953.6149-4-luizluca@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180817234953.6149-1-luizluca@gmail.com> References: <20180404232826.10815-1-luizluca@gmail.com> <20180817234953.6149-1-luizluca@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180817_165025_999477_988082DD X-CRM114-Status: GOOD ( 11.45 ) 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:c0d:0:0:0:243 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (luizluca[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [OpenWrt-Devel] [PATCH v3 3/4] base-files: add sysupgrade -o to save all overlay files X-BeenThere: openwrt-devel@lists.openwrt.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: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Luiz Angelo Daros de Luca 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 | 52 ++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 45378d7266..ca02577c26 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;; @@ -54,12 +56,14 @@ IMAGE="$1" [ -z "$IMAGE" -a -z "$NEED_IMAGE" -a $CONF_BACKUP_LIST -eq 0 -o $HELP -gt 0 ] && { cat <...] - $0 [-q] [-i] [-c] [-u] + $0 [-q] [-i] [-c] [-u] [-o] 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,52 @@ 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" -exec cat {} \; + find /usr/lib/opkg/info -type f -name "*.control" -exec sed \ + -ne '/^Alternatives/{s/^Alternatives: //;s/, /\n/g;p}' {} \; | + cut -f2 -d: + } | grep -v -x -F -f $conffiles | + grep -v -x -F -f $keepfiles | sort -u > "$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 Fri Aug 17 23:49:53 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: 959154 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 (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.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="EOqieHt1"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g86CfmKF"; 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 41sg2M4wtSz9s47 for ; Sat, 18 Aug 2018 09:51:07 +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=BUFCo0iqoChaNrYFMfXIT5yE5Q0o1SQ8l0CATGTCcOU=; b=EOqieHt1M/nwSA Wa/mpEeCC5XiujXHdMADCyn2BCIk1Gi16GRJJMI6LNfTk+MPmf/cKaxmbMpoBFX0G10FcLqYj7LmS 72d/FcFp3Cb4Ab4kpd5Sd0nNjDSFcKtP99hUEiX3tVuirjXO2NDfIlVLfkMdEg5ZJq4/94s9rz/6n /NMIXUwTjcGyXdtRe8Yx86eVbfTEWqxB10InMy/rc24Zc/svSVzJvloTaD0D2enGVgNaIjtslAy1A wyf0800Ceimji7EDkmHLjC+9JZTr43bbgZ6DObTHeFK88o4Tnt4wtBHyx6+yBDzrSouq+Y9K2sjFK UoAh+LzZyEnGwa553B2Q==; 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 1fqoWH-0003CF-26; Fri, 17 Aug 2018 23:51:05 +0000 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fqoVd-0002Ec-V5 for openwrt-devel@lists.openwrt.org; Fri, 17 Aug 2018 23:50:28 +0000 Received: by mail-qt0-x243.google.com with SMTP id h4-v6so10585938qtj.7 for ; Fri, 17 Aug 2018 16:50:17 -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=NLzHuzBm+ZltoP/a8bKO92f7Fakv5fKFo3KwLJDevK4=; b=g86CfmKFWip9XNn2o3ofeDigjCPv4vbw8SZSTaDxxtXhCiUz3lnOinJ+F6B97kja3e Z1hDcOBuvK9dju/NiI77iOIq2fmB8IVzD2h+72KDXHcYpDTd6V/mOugujuILlq+DkW3u 1ePLi+Yi6R4JjlYzhut/fP5rQKcdsL0VqA6TNiaTSoUrgOSwwBHi5yD6u+S9aLwkQd7e 8F5vR06RPOjq+HUkOa41dHb3gpyn7oKgdFMOZ7HxUuRA04Nuki446dAvTByoyIIcOhWB cHxqss8I6j/epmREAFH+sE+j3Hm0qq/PuSZEsbLDlZAsGHupl+8Vl9ty0X9f/v43os8D /Awg== 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=NLzHuzBm+ZltoP/a8bKO92f7Fakv5fKFo3KwLJDevK4=; b=fx6TKeYgaiPttQmWpqVScYe84cnZS0kuVoH4KYF98SdnOkzlluErfa6lr380jBHSu3 A3yxXh1WVRxqyFbRt5ltk9tijzYC4Pdg6PhFfKbUqVHSkYpyoVXBk5FFjWLf9P08SKlo GdxeCJHODfUSwGB/yJTw1uBoumv1pLxdND+KAURDM4HabMmb6MivkGPtiLk98rKo9HMf vn+or9RDRVN3mH9aLBDNwpJ17WVm/wRGutL9zi6p872UM9mGGrRmt6O6mTnBzM2yC0NN Z9TZ58WNLFIjdXj3HMAe5DaPO1sBYECaPubKMIq7eC9QcjdAldectJSnC6TQZMtCgcM8 gfFQ== X-Gm-Message-State: AOUpUlFUbXoYXcpwP//4JL/5CDQ/cByUORemAH2nw3IjXK5DfRtiPpdS jW2v5XOo7b/F/ws2a3JeT9KOMBVO X-Google-Smtp-Source: AA+uWPw3XJaIvWMMGfFy1sZ7eLHuqOHxxWnlpB+pAk0rlqfXt3RDaCV4MTVyP5N399eSq37r0h3G5A== X-Received: by 2002:a0c:bd0e:: with SMTP id m14-v6mr33196141qvg.92.1534549816150; Fri, 17 Aug 2018 16:50:16 -0700 (PDT) Received: from tresc043793.redetresc.tre-sc.gov.br (187-049-235-010.floripa.net.br. [187.49.235.10]) by smtp.gmail.com with ESMTPSA id s66-v6sm2082618qki.24.2018.08.17.16.50.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Aug 2018 16:50:15 -0700 (PDT) From: luizluca@gmail.com To: openwrt-devel@lists.openwrt.org Date: Fri, 17 Aug 2018 20:49:53 -0300 Message-Id: <20180817234953.6149-5-luizluca@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180817234953.6149-1-luizluca@gmail.com> References: <20180404232826.10815-1-luizluca@gmail.com> <20180817234953.6149-1-luizluca@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180817_165026_006445_7E9E6388 X-CRM114-Status: GOOD ( 13.33 ) 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:c0d:0:0:0:243 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (luizluca[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [OpenWrt-Devel] [PATCH v3 4/4] base-files: add sysupgrade -k to save list of pkgs X-BeenThere: openwrt-devel@lists.openwrt.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: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Luiz Angelo Daros de Luca When '-k' is used, sysupgrade inserts into backup a new file /etc/backup/installed_packages.txt which contains pkgname and origin (rom, overlay, unknown) without touching rootfs. It's maily used to reinstall all extra packages: # opkg update # grep "\toverlay" /etc/backup/installed_packages.txt | cut -f1 | xargs -r opkg install # rm /etc/backup/installed_packages.txt Signed-off-by: Luiz Angelo Daros de Luca --- package/base-files/files/sbin/sysupgrade | 36 +++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index ca02577c26..cb3b2918c5 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 @@ -20,6 +21,7 @@ export NEED_IMAGE= export HELP=0 export FORCE=0 export TEST=0 +export UMOUNT_ETCBACKUP_DIR=0 # parse options while [ -n "$1" ]; do @@ -31,6 +33,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,13 +53,15 @@ done export CONFFILES=/tmp/sysupgrade.conffiles export CONF_TAR=/tmp/sysupgrade.tgz +export ETCBACKUP_DIR=/etc/backup +export INSTALLED_PACKAGES=${ETCBACKUP_DIR}/installed_packages.txt IMAGE="$1" [ -z "$IMAGE" -a -z "$NEED_IMAGE" -a $CONF_BACKUP_LIST -eq 0 -o $HELP -gt 0 ] && { cat <...] - $0 [-q] [-i] [-c] [-u] [-o] + $0 [-q] [-i] [-c] [-u] [-o] [-k] upgrade-option: -f restore configuration from .tar.gz (file or url) @@ -67,6 +72,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 @@ -174,6 +181,7 @@ add_overlayfiles() { -e '\,^/etc/board.json$,d' \ -e '\,/[^/]*-opkg$,d' \ -e '\,^/etc/urandom.seed$,d' \ + -e "\,^$INSTALLED_PACKAGES$,d" \ -e '\,^/usr/lib/opkg/.*,d' \ ) | grep -v -x -F -f $packagesfiles > "$file" @@ -218,6 +226,27 @@ do_save_conffiles() { run_hooks "$CONFFILES" $sysupgrade_init_conffiles ask_bool 0 "Edit config file list" && vi "$CONFFILES" + if [ "$SAVE_INSTALLED_PKGS" -eq 1 ]; then + echo "${INSTALLED_PACKAGES}" >> "$CONFFILES" + mkdir -p "$ETCBACKUP_DIR" + # Avoid touching filesystem on each backup + RAMFS="$(mktemp -d -t sysupgrade.XXXXXX)" + mkdir -p "$RAMFS/upper" "$RAMFS/work" + mount -t overlay overlay -o lowerdir=$ETCBACKUP_DIR,upperdir=$RAMFS/upper,workdir=$RAMFS/work $ETCBACKUP_DIR && + UMOUNT_ETCBACKUP_DIR=1 || { + echo "Cannot mount '$ETCBACKUP_DIR' as tmpfs to avoid touching disk while saving the list of installed packages." >&2 + ask_bool 0 "Abort" && exit + } + + # 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} + fi + v "Saving config files..." [ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V="" tar c${TAR_V}zf "$conf_tar" -T "$CONFFILES" 2>/dev/null @@ -227,11 +256,16 @@ do_save_conffiles() { exit 1 fi + [ "$UMOUNT_ETCBACKUP_DIR" -eq 1 ] && { + umount "$ETCBACKUP_DIR" + rm -rf "$RAMFS" + } rm -f "$CONFFILES" } if [ $CONF_BACKUP_LIST -eq 1 ]; then run_hooks "$CONFFILES" $sysupgrade_init_conffiles + [ "$SAVE_INSTALLED_PKGS" -eq 1 ] && echo ${INSTALLED_PACKAGES} >> "$CONFFILES" cat "$CONFFILES" rm -f "$CONFFILES" exit 0