From patchwork Tue Nov 10 13:45:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 1397651 X-Patchwork-Delegate: yszhou4tech@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.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; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=ZOqawtOp; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=h3Ymm//Q; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CVq1q1tsyz9sPB for ; Wed, 11 Nov 2020 00:47:59 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ZVCHyHUsmUy8oA2pzMD9zC6UCdJFXTwVC48xJhjkggs=; b=ZOqawtOpaN6UMRf/RVUFnfjAn S5tiBBuNJaUkARP86juBqwCZXTe8LBkxkhqMQ5DJ+XcKo2RT1WJKzUMG5by5WHO7ZdquiVo2kKfcX vrICAWv5DCbzjtchvPQyGTQykaJpeMo1goL+eC6Ra8NhAO5hFOEomK9ufbp7FghTaBpPJZHhrmag5 pfxbgzLKlPuuqaLNEUfHlUlnOaRLW/ujIxODEr7QZ8PSVHcoCxrSpcjCwI1tnFwSV8uWhhu+XXukj pZafUOZc3JdAPookLFpAfRKHVvMayf4uL9UU71g9m6IL6c1gOCTdOmKbQiHEnF7R21pefJ9G62ld+ K4Yg9wcew==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcTya-00024e-U2; Tue, 10 Nov 2020 13:46:25 +0000 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcTyV-00022D-Gz for openwrt-devel@lists.openwrt.org; Tue, 10 Nov 2020 13:46:20 +0000 Received: by mail-pg1-x533.google.com with SMTP id m13so2040673pgl.7 for ; Tue, 10 Nov 2020 05:46:18 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=cCIlxboU0GICX4QXDGl1X9OlSh21nBhDL7wj/5i4EQk=; b=h3Ymm//Q7snSncvh4QwkjXiCC0NDpb9ml4HrHE6SwtMHgCaWgTkE8FuL/WviA9bmec JYdnkza1ehJUtL+37vOP5Yro7JutOrjfQHmgjbxOwaar5d1QeXV27bo70oAhyofp9edu XYBpZ4MTURzBIxEpJlEUcEKa3ELUJgz5yPTLxgV/3riuAF7JvtOvH1YWzdMWLtiJvkl0 Nvm3H8Q1WuqDuM3VcTTwp9Mt9SZqDtoxwkJzFyj36Ov+4Tw7zf4SpVrHFbbgR7SQH0q3 HV3H7N4IINL9yeWJMHZU5aEDd8rsfY01KOacOLGaLvZu7/QlzEmAs+8PNJgL0a2tLKLw 5FJQ== 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:mime-version:content-transfer-encoding; bh=cCIlxboU0GICX4QXDGl1X9OlSh21nBhDL7wj/5i4EQk=; b=mj7HTvgT6PCKWEKxeXXfLX72B6StJsB9CsmFrY33hQsI0nu496zk6JaUotxybMijHg cxlORnBFOpwOjgulVHcDjgrkmbJ72MHP7scUwrXerZv3y+9e++TM/6DCfr5OVuVSkOCr RgV3wthK2C+wl6MJkJmIWh44ne46QVMEgttcieNLPZVHhUvO0TuU+k+B+J5aCLBCKtqM UPJYFKydCGnIh4MldwB98OMdRIunjonfXxGY7ClbuI9Rtd9xJc+c7aMi1ypNKz03op+F R/S9ZnfL61sMo4/3bm+xLv53I63DnaRsthrH7240d4vfYPdXDAv+gHi0j8sorzW1PcrX y0yA== X-Gm-Message-State: AOAM5333DXQmHBqg1b5d7lOVwglPLiqYTbUsRAn+Vr+pR3Daxi0uJeCe +K5NBq7IGkjLIK4OKYTwI7o= X-Google-Smtp-Source: ABdhPJyogWpMp1dds0KCICO0Sipq3/9TncZTzyvtepkOn5Je3K94q5fqder7nQHkf6z4gG6FSFa7Ag== X-Received: by 2002:a17:90a:34ca:: with SMTP id m10mr2554595pjf.193.1605015977269; Tue, 10 Nov 2020 05:46:17 -0800 (PST) Received: from titan.office.yunion.io ([103.119.177.162]) by smtp.gmail.com with ESMTPSA id h68sm14605101pfe.74.2020.11.10.05.46.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Nov 2020 05:46:16 -0800 (PST) From: Yousong Zhou To: Adrian Schmutzler , Philip Prindeville Subject: [PATCH v3 01/11] base-files: upgrade: log with date prefix Date: Tue, 10 Nov 2020 21:45:48 +0800 Message-Id: <20201110134558.7905-2-yszhou4tech@gmail.com> In-Reply-To: <20201110134558.7905-1-yszhou4tech@gmail.com> References: <20201110134558.7905-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201110_084619_595549_5E072318 X-CRM114-Status: GOOD ( 13.05 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yszhou4tech[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:533 listed in] [list.dnswl.org] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou , OpenWrt Development List Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org And log to stderr Signed-off-by: Yousong Zhou --- package/base-files/files/lib/upgrade/common.sh | 2 +- package/base-files/files/lib/upgrade/stage2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 2eb26ba44b..2ae83f5bfb 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -64,7 +64,7 @@ ask_bool() { } v() { - [ -n "$VERBOSE" ] && [ "$VERBOSE" -ge 1 ] && echo "$@" + [ -n "$VERBOSE" ] && [ "$VERBOSE" -ge 1 ] && echo "$(date) upgrade: $@" >&2 } json_string() { diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2 index a4fef42134..211a3f4b33 100755 --- a/package/base-files/files/lib/upgrade/stage2 +++ b/package/base-files/files/lib/upgrade/stage2 @@ -42,7 +42,7 @@ switch_to_ramfs() { mtd partx losetup mkfs.ext4 nandwrite flash_erase \ ubiupdatevol ubiattach ubiblock ubiformat \ ubidetach ubirsvol ubirmvol ubimkvol \ - snapshot snapshot_tool \ + snapshot snapshot_tool date \ $RAMFS_COPY_BIN do local file="$(command -v "$binary" 2>/dev/null)"