From patchwork Tue Dec 1 17:29:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1408958 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=CKx69wQi; 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=CEe3nlzv; 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 4Clq0c1W0Lz9sWB for ; Wed, 2 Dec 2020 04:32:00 +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: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:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OGiQbdoy84D4wQtYi+bNAtPfTBkKrvom5GbFzrV/30k=; b=CKx69wQiZmilrSmOZPm51kJAaK QL6UQnjuymWrXP3pgLz73675qw9AeLPEoqjKH1Rm8h98jmG3V5tyXHAlarZKDSzK+g2LXtbAsMMGs POIJVmAFlcUNUAke7F8Iigvq3oBj2agqCbx30lPeeNaC4Ejec6CcWLKIJN0QbGKf1rbFtj82/kgHU kaUJ3/tgmHToxEGdQ3ptCheTQuprBaIuzCnnSfUooVlUiP2rOF78E6xP7AMqPIjAxkl3y4GxFRk1r Hn9oeRgovrnrSLptn0PRGlVKqpTA9kZR9fG+bScG2mpa+iUll/8JW5YHlUoQtAPsP4ZSMxQUu+Kc9 H5zxvCvw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kk9TA-0007nl-8z; Tue, 01 Dec 2020 17:29:40 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kk9Sz-0007jK-Lq for openwrt-devel@lists.openwrt.org; Tue, 01 Dec 2020 17:29:31 +0000 Received: by mail-wm1-x341.google.com with SMTP id x22so4883344wmc.5 for ; Tue, 01 Dec 2020 09:29:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=oog47abBQFZPvAO1T4ogP5xaNPvAcj/FTq3J0jY+LnQ=; b=CEe3nlzvUsGWjD8QZ7w4N103kNrmoMStpL/3M/NIlole2fxJcl3eITDevgnbgzyZzP +fs6ftNxXuCF5us6ZbK3zCKTufRnbazfuyXLOQsTd323tOwbViBo3hJSUT3508uUhiak vvPB6ELL2N9yHBcoLgcXGoXaqrz6QcDquWkTtAxVrxV669WrPShoTQb8PfJyV1/JjBHi /Gyp8k9vowPIQq8Mz/qqFoRjm5pgYAgYE71T0k7os9+mMy5EMa0106EXx7jIJCB3wnfC oHitVQITZBbknb1gs3OUylki/CKDMIMNGiWP+a0nPsURJxKIDhmTrM9SAtETEIRActOi /Xmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oog47abBQFZPvAO1T4ogP5xaNPvAcj/FTq3J0jY+LnQ=; b=LeKDWn5CLBWnCu9DaPK/lFlEjJ3kZWIBT7nSNSz49gUxyR1aO2qCDpAldHoO9MHxyn hrPlhRVXprUpaQPp+3mzsxuw1MD3AYKnj5u0QGtEOWnhlaNQOlX/0BXsQUhD9chuigMD aquHruni3IaLP39+2Vdrtfu0I+vq7MdqEEPsWlC6AkP4D4VUaoHqlu7maBeOHJ0AMHdE 0NrN1/rrPTE3dHpGTeo3L+CMgUGwdFVLnUY2nQclSxPBqqboucc8/rbaf391nT8Fo2y5 dIoLaPnG1MnwlEYGAQdySxLHua/C7eR2v3UPB0ENmx60+LPiv4ZvrYadqkC+nvjvN+6p YQKw== X-Gm-Message-State: AOAM532XO9at5eFrm6v62HN06EiQ2xjOlNqWeZtvs/0NqVvoa+6zjNMC kObjt/W6hq3zPZa/k64noeFXKLw7aA9mPSgx X-Google-Smtp-Source: ABdhPJxmQoHT8j2O8o7ehgw1WZbg1jx7qZBnZhAFYldVh0t+R4MzjTOGTvcP1gMlyzE6lo/V8GqyJA== X-Received: by 2002:a1c:6a10:: with SMTP id f16mr3840938wmc.106.1606843768185; Tue, 01 Dec 2020 09:29:28 -0800 (PST) Received: from localhost.localdomain (terefe.re. [5.2.67.190]) by smtp.googlemail.com with ESMTPSA id o5sm826627wmh.8.2020.12.01.09.29.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 09:29:27 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 5/5] mvebu: sysupgrade: write additional information to log output Date: Tue, 1 Dec 2020 18:29:17 +0100 Message-Id: <20201201172917.414896-5-tmn505@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201201172917.414896-1-tmn505@gmail.com> References: <20201125163341.2681-1-tmn505@gmail.com> <20201201172917.414896-1-tmn505@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201201_122929_743147_2EDB7F20 X-CRM114-Status: GOOD ( 11.63 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:341 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [tmn505[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [tmn505[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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.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 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This will explain what is actually occuring on dd invocations. Additionally remove comments for steps which are described by printed statements anyway. Signed-off-by: Tomasz Maciej Nowak --- v1->v2 Additional remark in commit message. target/linux/mvebu/base-files/lib/upgrade/sdcard.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh index 0f95b1b65971..caa726b4d529 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh @@ -9,7 +9,7 @@ platform_check_image_sdcard() { get_partitions "/dev/$diskdev" bootdisk - #extract the boot sector from the image + v "Extract boot sector from the image" get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b get_partitions /tmp/image.bs image @@ -40,7 +40,7 @@ platform_do_upgrade_sdcard() { if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then get_partitions "/dev/$diskdev" bootdisk - #extract the boot sector from the image + v "Extract boot sector from the image" get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b get_partitions /tmp/image.bs image @@ -59,7 +59,7 @@ platform_do_upgrade_sdcard() { partx -d - "/dev/$diskdev" partx -a - "/dev/$diskdev" else - #write uboot image + v "Writing bootloader to /dev/$diskdev" get_image_dd "$1" of="$diskdev" bs=512 skip=1 seek=1 count=2048 conv=fsync #iterate over each partition from the image and write it to the boot disk while read part start size; do @@ -71,7 +71,6 @@ platform_do_upgrade_sdcard() { fi done < /tmp/partmap.image - #copy partition uuid v "Writing new UUID to /dev/$diskdev..." get_image_dd "$1" of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync fi