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: 895209 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="tpTxxjaR"; 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 40GhxB5Zkhz9ry1 for ; Thu, 5 Apr 2018 09:29:02 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 3DE51B91481; Thu, 5 Apr 2018 01:28:43 +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:43 +0200 (CEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 797B1B91460 for ; Thu, 5 Apr 2018 01:28:40 +0200 (CEST) X-policyd-weight: using cached result; rate: -7 Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 5 Apr 2018 01:28:39 +0200 (CEST) Received: by mail-qk0-f195.google.com with SMTP id w6so24477227qkb.4 for ; Wed, 04 Apr 2018 16:28:39 -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=m8avwU1Ai/L+sdRe9pB+tpUzsEOkAw3Clt28PmBRfeIVVh2DGXgVoKGVFtmcKMonQ/ s2JO5Z6dA13KnLaFpPG3krProFemWSrZhfTZZ2tAy38cXNT4QCdIwXJMRMPdQdq3eAvj Nc2ztUqsqQSn83cffaTP7qh6Kw36DqmOjUVApsqqbZ27WNwo0ee6aTj4ZZmU9HxhGVTj W8h72Rtxut4Smr5QndQg7d3/sATbFAs8cJ5xBTdKdk6HassuU1tnodPAKjXCveToJlK+ cbNp/ISMkf1eBhhI046cmcNBSIq9/aycKPYqWmQBRUSM3le2RVCTVMDtuLe4v1bCbYAf DdCA== X-Gm-Message-State: ALQs6tCKRgjCofZhX9UQ5OIYnoEtWI9p88XD7uhV/k86xY49a0g7vMtP 8J9fpDkqck9NPGvVzFkwhrDxMA== 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> Subject: [OpenWrt-Devel] [PATCH v2 1/4] base-files: minor cleanups on sysupgrade 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" 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"