From patchwork Wed Nov 25 16:33:34 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: 1406144 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=qUHJgiqJ; 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=EwhveGIC; 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 4Ch62f68Tnz9sT6 for ; Thu, 26 Nov 2020 03:35:54 +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=ETk2solbbWE2229jMim3IsEv7r6Grxk9jvbNpHm3r7M=; b=qUHJgiqJHSiIsUlFRukMOtUstS LHg+sBFqttuOL2wtCkwocE4BSMxpTweBweyL1PTvAUTgPLy5yO1y99hTVIi7PuVr/dicTL9uyUu8Y bKKsg3CK2IZWEpmxhO/XuPlKO7o46XQBpZe+4OETtM3ae886DdU2FtsXfppzbhlynit0unLNmKVpv Clp79v1IQnDK79AuOZOxydrD6Z4MBtM4AmazsjEuhGSd+MDXTMZYIqQz8m5MuPPAVzsUObaGLczL/ 4o1rGEzZGKGl1rNKqkV11TihcAP2nBAgm6oCaiydqxNI1OKyHMgeUsSLi6zpW6QPZOIe3Lq7kwyIq 5gboRPVA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxkI-0002PF-Ks; Wed, 25 Nov 2020 16:34:18 +0000 Received: from mail-lj1-x232.google.com ([2a00:1450:4864:20::232]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxk3-0002K6-9j for openwrt-devel@lists.openwrt.org; Wed, 25 Nov 2020 16:34:05 +0000 Received: by mail-lj1-x232.google.com with SMTP id o24so2937202ljj.6 for ; Wed, 25 Nov 2020 08:33:57 -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=qRYy0nSMWdHBVttWWwKLxXBeYyW1Ry9qYUwCaGIwld4=; b=EwhveGICYiBLQy46VnV8Bz/js/ozSYwpPAW40lSpWSIGeVA4g/OK9gb3szzr8tmine T0/tMD/iPkyZ7tLpZ5RKxGVvShxOmw0Yur0RbTlfhqTaBO+D1kwl/Ch4AAdpFckJClvH rhHU9L9ERPg7bDngz6Xy41B4PdQ8Nlt1gh8W+Rd7upk71e+BJsCGt2sB+rmrw8s5AW/A qPvN7rXlw8VbnEYJGgFjlpokpV0rwkJq0KvqOOdZ4IBnwseK0mGT5RCmjl4bwuMcNzqH siFHpu5iwfWhNzHLzfwgrSFJOVlcqH9r1t6HGM51CLu3Me9Bk2SELsDB8bZApTlWRnS2 F+2Q== 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=qRYy0nSMWdHBVttWWwKLxXBeYyW1Ry9qYUwCaGIwld4=; b=ENDXIF95ncEqGr6V2w3X9F39pn/uxtkwqTnbUGxbjpBmFjYiaRLtPti4Ol3wY6EAP5 oOcoIRY2pOhRCWJXXoQxCS3cfKntYanOrjSFa70paJZoPBU6//jTgMbWTLO+ktKvcZCp JqYHbAL9jbAPG9OjAslkzaZ4awzrvdAJAhZ2WeV0DTU0+sFahrLdjRqjWS8woIcJsMoQ NyY9qIUTVH/rGdqT/Hl8Jsx/zOGlkq2CivEUIsaPdAEnRURhMW1+VSBsJtDrUYJqR5vo 2kwYl4KT1o40BAvKP+yQPbPF1ih70H04x6XnZGRNYc4lPjMd+KHHRHy3hXzg8X3WSz65 i2kg== X-Gm-Message-State: AOAM53359AUwKq/GoVCq5cl2z+itt/PnznXaJ1km50m7KM9P0u4IrOw2 UaOXbbz1qrrxTHZhTeQ96LEdfLAdCksJkQ== X-Google-Smtp-Source: ABdhPJzn/UbzCoBAvhBP40+5nKCHf2ltjo32hmACGpj3cex55W1HKI5nw8GFUPFheFBZFTVKIZityQ== X-Received: by 2002:a2e:5c7:: with SMTP id 190mr1815625ljf.403.1606322035745; Wed, 25 Nov 2020 08:33:55 -0800 (PST) Received: from localhost.localdomain ([194.29.183.4]) by smtp.googlemail.com with ESMTPSA id c8sm316465lfb.98.2020.11.25.08.33.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 08:33:55 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/8] mvebu: sysupgrade: remove MBR check Date: Wed, 25 Nov 2020 17:33:34 +0100 Message-Id: <20201125163341.2681-2-tmn505@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201125163341.2681-1-tmn505@gmail.com> References: <20201125163341.2681-1-tmn505@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_113403_400704_D4239BA8 X-CRM114-Status: GOOD ( 11.49 ) 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:232 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 [tmn505[at]gmail.com] 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 Message has at least one valid DKIM or DK signature -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_EF Message has a valid DKIM or DK signature from envelope-from 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 is already done by get_partitions. Signed-off-by: Tomasz Maciej Nowak --- target/linux/mvebu/base-files/lib/upgrade/sdcard.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh index 184803a50f14..d16ddc500079 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh @@ -1,19 +1,7 @@ -get_magic_at() { - local file="$1" - local pos="$2" - get_image "$file" | dd bs=1 count=2 skip="$pos" 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"' -} - platform_check_image_sdcard() { local file="$1" local magic diskdev partdev diff - magic=$(get_magic_at "$file" 510) - [ "$magic" != "55aa" ] && { - echo "Failed to verify MBR boot signature." - return 1 - } - export_bootdevice && export_partdevice diskdev 0 || { echo "Unable to determine upgrade device" return 1 From patchwork Wed Nov 25 16:33:35 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: 1406140 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=bxIbnFDs; 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=e0EdUNGN; 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 4Ch62W0Clqz9sT6 for ; Thu, 26 Nov 2020 03:35:46 +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=wHCZG4wSUk+ABskIyXq+JGjrw3sMwrm255ywnCf17kA=; b=bxIbnFDsfPuUENvuIuI1eXCysB 5LE9/KQyYda833OHz6HE+O/vI2z+G+nW5yH7osiKPO/zWIlF1S4erI87XLgvsPKedowEQneXz24y3 XCuoennuvleIV9QAAqz+PJ0JlpFBsYG/AtnpzSCSQ5ikdZfXY3GrujmzfrLES5AXKB2fmv+XkNQ4K yq86X9n1UsTNIBKh7mJPmpaehwaFnyB3SbP8RikSSVk1JmXoigkyHwRV3rZMG98IP1KQmfLCedGXr S/B4U725M8WE0l5k6ZNpnyqA7/CfkhwDytJo22Ua0bxQmsvbouzEbhbt0sE+LLJtLufvSSB5OsAnu 4S3ta6pQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxkC-0002O5-QV; Wed, 25 Nov 2020 16:34:12 +0000 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxk1-0002K8-Bz for openwrt-devel@lists.openwrt.org; Wed, 25 Nov 2020 16:34:04 +0000 Received: by mail-lf1-x12f.google.com with SMTP id l11so4028253lfg.0 for ; Wed, 25 Nov 2020 08:33:57 -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=zJxJx4uxAhkHCaegAG3weeEZz905z5ah1cCMKgPXq/8=; b=e0EdUNGNi50nZz6pMG7kARdRcD0Y1Bqd2MIvwMlU35FC0THZTEvA/gFzM7g8uIfjRP 0Z3iPGTPhgqI81QaPFG6s/fSUq7dP7WKNxu3JfpsVY6lSDYgl5SfsDTwjPNjYs4H94c3 77iVKB+VQLQKINQJ3LJVybVWUrJeWE+/E/bChutbBiy+m/OtQrc1lB1oabWIR2BTe04/ x/Ebs6uSslFOXxAK/fA/+XCWwmQyZcr/1u/Nh2IhoLllclgi6AMeGxdJKi9/k9N8RJTs rMXq6sUmrTdwSpvRV9Pv2I0x3tULNFCd5KpCHpSGm6gwBScR0kgh13Dha1mTfZ9MhTdO 9HKA== 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=zJxJx4uxAhkHCaegAG3weeEZz905z5ah1cCMKgPXq/8=; b=njZwNk9SmaZwj99QdgU3QOoBSbnVB4elyjrzuKl5OaukjDAb3bYfJGc3pwCrEFkVWX kef4xTrBu+vdmfbEoHqXwEa6pQ2WwgseSxZ7AXT7PR7BDKHyF/8Xs6E98M6vxWnt6q2k bHQfAOwCLr1PAvxEfgnMGQX047E2CfOydb6UDJgJ5zudxNT75Be4aon1tu29LjS0Gq52 6g4IIbGuTTW2zRgAzMfdAc00aKEnDxwuCuHpq5be1TV7YVhOVkmh57YmAHoVb0K+gBWM 5NuWH4yrws2RVnpwRZI4zscmWTadrLI5n0Ir3kDJQv6jHbc+vGJrxBKKDlc2ke+Fs/Hi RfLw== X-Gm-Message-State: AOAM533c3O4p98oBeas9BsLXxhw7mp4ijqPAdPXyqveY+x84ivEFtif+ kKlI06ycIGaOX6VlHxn8t0EtYA1vcUPl3Q== X-Google-Smtp-Source: ABdhPJygZelbnEIL+trbs2bIpgoUePCi67t+uFLUwHVntuu2++8DjPAm6XrY3ICYe5wuik+mJWkV0Q== X-Received: by 2002:a19:c7c5:: with SMTP id x188mr1853957lff.364.1606322036678; Wed, 25 Nov 2020 08:33:56 -0800 (PST) Received: from localhost.localdomain ([194.29.183.4]) by smtp.googlemail.com with ESMTPSA id c8sm316465lfb.98.2020.11.25.08.33.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 08:33:56 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/8] mvebu: sysupgrade: use v function for writing logs Date: Wed, 25 Nov 2020 17:33:35 +0100 Message-Id: <20201125163341.2681-3-tmn505@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201125163341.2681-1-tmn505@gmail.com> References: <20201125163341.2681-1-tmn505@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_113401_598006_2E354643 X-CRM114-Status: GOOD ( 13.15 ) 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:12f 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 [tmn505[at]gmail.com] 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 Message has at least one valid DKIM or DK signature -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_EF Message has a valid DKIM or DK signature from envelope-from 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 Signed-off-by: Tomasz Maciej Nowak --- target/linux/mvebu/base-files/lib/upgrade/sdcard.sh | 12 ++++++------ .../mvebu/cortexa9/base-files/lib/upgrade/linksys.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh index d16ddc500079..f189c240cf09 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh @@ -3,7 +3,7 @@ platform_check_image_sdcard() { local magic diskdev partdev diff export_bootdevice && export_partdevice diskdev 0 || { - echo "Unable to determine upgrade device" + v "Unable to determine upgrade device" return 1 } @@ -20,7 +20,7 @@ platform_check_image_sdcard() { rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image if [ -n "$diff" ]; then - echo "Partition layout has changed. Full image will be written." + v "Partition layout has changed. Full image will be written." ask_bool 0 "Abort" && exit 1 return 0 fi @@ -31,7 +31,7 @@ platform_do_upgrade_sdcard() { local diskdev partdev diff export_bootdevice && export_partdevice diskdev 0 || { - echo "Unable to determine upgrade device" + v "Unable to determine upgrade device" return 1 } @@ -64,15 +64,15 @@ platform_do_upgrade_sdcard() { #iterate over each partition from the image and write it to the boot disk while read part start size; do if export_partdevice partdev $part; then - echo "Writing image to /dev/$partdev..." + v "Writing image to /dev/$partdev..." get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync else - echo "Unable to find partition $part device, skipped." + v "Unable to find partition $part device, skipped." fi done < /tmp/partmap.image #copy partition uuid - echo "Writing new UUID to /dev/$diskdev..." + v "Writing new UUID to /dev/$diskdev..." get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync fi diff --git a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh index 6ccfdd0768da..c5da471d76f1 100644 --- a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh +++ b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh @@ -57,7 +57,7 @@ platform_do_upgrade_linksys() { if [ ! -n "$part_label" ] then - echo "cannot find target partition" + v "cannot find target partition" exit 1 fi From patchwork Wed Nov 25 16:33:36 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: 1406145 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=A1BG1/z6; 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=FEreSN1n; 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 4Ch62j05f9z9sSn for ; Thu, 26 Nov 2020 03:35:57 +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=Sb0rLnD7/8B9XRjYMnYPomPImkpoIt0DtN978PERbFQ=; b=A1BG1/z6+3k/zfLDc5/kBvF8a6 qVOoivh2xqHFJwl0i+uikxdFTlC57Z1xx4O7JNEf+ZMSYpZPUZiBE58p1RiOhkLmaWRJs0+Tm5RpS V5w/ns0xT5+GaLvLcJ6WIfTALCf53nmRDkUPOh+RYZkWwNdSxk4NbSRGaQkDk8StjMX4VPeA7Jto5 2cJfBX+O926Ph1YBycZlaqKotBq3SKPFhQMDdFI/AoTQQMQKiHooeoS2endWFFJUrARMXyypcUh/I q7hOQVbjn5nEplPHjtZhV5IIRZYYIVEwY3uXMEXoSaAnWRGt4NUi/WbEaXI6iLwDYZAlEqXx39x59 gCSbADoA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxkK-0002PT-49; Wed, 25 Nov 2020 16:34:20 +0000 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxk3-0002KB-8z for openwrt-devel@lists.openwrt.org; Wed, 25 Nov 2020 16:34:05 +0000 Received: by mail-lf1-x141.google.com with SMTP id a9so4014706lfh.2 for ; Wed, 25 Nov 2020 08:34:00 -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=D74T85CvjGvJhWwW3qKeZo7lY0+YpPj05RrzWHzVfuA=; b=FEreSN1nCTcEFvmve7v+et3i0H67jHd+ImC9sfsHt4iO0CvBwyyd7lTw1/PoGL67fU gwcVKao16W4eVLH8tqy7qdc9x4QlHGk1EkG77QE8NkGdzWeoVK/2G2tsWKf6xIm++Mf3 /YVFKWP6gpJOUKX3Ql7xZh6OQI4zR2Wt7qbfjdJWbTMv9znfA/wac9C6fIks1RvluxaK 8cVsOu2ZxEnO2wBVQRuYrQfvJsQquYr3KgreFmA2ZKEIyaziw6GVG+lXygdXeemHHNty L0KbWsz/4k/cl713MDQb+f6If5Of4YUjxZlN+noLYKMiEGZwbRLX1RjoDZtNuiYq96TQ DEfQ== 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=D74T85CvjGvJhWwW3qKeZo7lY0+YpPj05RrzWHzVfuA=; b=Oo6FAuFlckdv1CBS4D70tmnLssaKLzp7xVXBCb5yaM56cG/sMH0P3mKnoqADG/vGth nOqWD9OYkbTiNYeJ7rHRYSB0P7o/mWaHvIIjp/MpxbKYcx4h/KrG235Rmgl0/sGem4EW EkuaD428h40CGlbtWW2nWu0+4TwhAvPo1OT8SNbBWwVoeIDH8aSiFkRvG0/DJhKHvWzU jWuIucDbd+WfL2AkmbufzeoMd/3/S7FGjncLxw8LJKmo39UF9ZgcCdH8Jz/gvcHy9nXk 7x1ldbdISEO+Nn+PPCiQK93KVOb4Nr5EDEYInYaks3wJ9MLKyZjhusWfS9Di0fij/9jG QR9g== X-Gm-Message-State: AOAM532NQVnw6FRLssa6zPtMv/hN3gjksCT8bnD3HQiglB24YsBqWgnY hmxuh+MZpjjFDxLsHxnJln0Z8UyZdRqcUw== X-Google-Smtp-Source: ABdhPJyAIznYXgUnr53TXTZ81G7AFmqfri9w7vnItKNpRZ8wy+pzrv1sxxCcMsXUKpc7EftryOhsZw== X-Received: by 2002:ac2:4836:: with SMTP id 22mr1709642lft.41.1606322037747; Wed, 25 Nov 2020 08:33:57 -0800 (PST) Received: from localhost.localdomain ([194.29.183.4]) by smtp.googlemail.com with ESMTPSA id c8sm316465lfb.98.2020.11.25.08.33.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 08:33:57 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH 3/8] mvebu: sysupgrade: use get_image_dd wrapper Date: Wed, 25 Nov 2020 17:33:36 +0100 Message-Id: <20201125163341.2681-4-tmn505@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201125163341.2681-1-tmn505@gmail.com> References: <20201125163341.2681-1-tmn505@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_113403_405959_D6C53BCD X-CRM114-Status: GOOD ( 12.15 ) 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:141 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 [tmn505[at]gmail.com] 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 Message has at least one valid DKIM or DK signature -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_EF Message has a valid DKIM or DK signature from envelope-from 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 function eliminates false-positive erros emited by dd. Signed-off-by: Tomasz Maciej Nowak --- target/linux/mvebu/base-files/lib/upgrade/sdcard.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh index f189c240cf09..14d6b9144e9e 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh @@ -10,7 +10,7 @@ platform_check_image_sdcard() { get_partitions "/dev/$diskdev" bootdisk #extract the boot sector from the image - get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b 2>/dev/null + get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b get_partitions /tmp/image.bs image @@ -41,7 +41,7 @@ platform_do_upgrade_sdcard() { get_partitions "/dev/$diskdev" bootdisk #extract the boot sector from the image - get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b + get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b get_partitions /tmp/image.bs image @@ -52,7 +52,7 @@ platform_do_upgrade_sdcard() { fi if [ -n "$diff" ]; then - get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync + get_image_dd "$1" of="/dev/$diskdev" bs=4096 conv=fsync # Separate removal and addtion is necessary; otherwise, partition 1 # will be missing if it overlaps with the old partition 2 @@ -60,12 +60,12 @@ platform_do_upgrade_sdcard() { partx -a - "/dev/$diskdev" else #write uboot image - get_image "$@" | dd of="$diskdev" bs=512 skip=1 seek=1 count=2048 conv=fsync + 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 if export_partdevice partdev $part; then v "Writing image to /dev/$partdev..." - get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync + get_image_dd "$1" of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync else v "Unable to find partition $part device, skipped." fi @@ -73,7 +73,7 @@ platform_do_upgrade_sdcard() { #copy partition uuid v "Writing new UUID to /dev/$diskdev..." - get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync + get_image_dd "$1" of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync fi case "$board" in From patchwork Wed Nov 25 16:33:37 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: 1406138 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=KhSfj9J9; 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=UNKHy7AR; 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 4Ch62T1YcTz9sTR for ; Thu, 26 Nov 2020 03:35:45 +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=ByzHw4CYp8/nhwcqYBJx/ix+KLz+CT41ompCjtjL3WQ=; b=KhSfj9J9J7nKjSwFYQDuIjof4B Wgiu6paFDVRybDKb0vISvnQAO0iYr0dQoBMfbxJ6m0XVYslMOY2MAVFGqJvRz4mSAx8w3cgtURLB2 5/F/9RTpxPUQuZWu5t3ggKt14WWx5NgMpetggs8wjGYqSdIXgh5hTqbKsExBRvwYOAUtRdTpP1LX7 jojr2UCHQNLLaM0aIS1rYEIlv8mmYq3f9bYyNC5PYve5O8RWPPxML3ZPP0HAMFP9PnxFAQRMElGAl lgTwSayyokoMPQavWM9r/qVVtWE1IvjzAO+vJ+PxNV2LrWwRy1gMdfnZzFM2XWq81VI+cI9C+FJn/ 8SELG9Ww==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxk7-0002NH-A3; Wed, 25 Nov 2020 16:34:07 +0000 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxk1-0002KA-By for openwrt-devel@lists.openwrt.org; Wed, 25 Nov 2020 16:34:02 +0000 Received: by mail-lj1-x244.google.com with SMTP id 142so2920657ljj.10 for ; Wed, 25 Nov 2020 08:33:59 -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=08ZiRFlMSkjqRsbK/bO478SU3OY4ILWSH+X+IjwyW/4=; b=UNKHy7ARUDYEDopiN0j3qGYn6HaIok7M/+Aa+TvO0zFeY3Xh1bMOhDwEDf4wFX3Eum bN8VdBuoduI0CKXRpeoQJCczulwyndxm8nIu4ai9q4IAJjM5PgWjfL1SL5miIZqtijMB f4WXHS87j4gNsw3YELYNS+snQ+CHtW1+trWm5HbaNz3SGuZLUnPyLUbZraAVG0TCVZ1I Zwf+13R9NOr89HQFfe5Q4VCzfHca6KaBMSRtGipQp8ksk9zmd67hadrTha8pBTxv+R13 EunMemQtfYT8wA7TLTgEuG7wyRrwSBy9Jf7x+TR/NnRHMeSuKxN/GfERO7HslU1gbLID gXuw== 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=08ZiRFlMSkjqRsbK/bO478SU3OY4ILWSH+X+IjwyW/4=; b=lXhDVMrFGZAE9T0s6BYXZAtrCg5rfGGgj2jiTveNt3pFLA2Ql0/RLdZAoW2KISV0To 7TJJwVpYNnFS4D2RIjDLlE+sVSs1EoQe03hf4jvJUj2YR0U/pfI9N0U4h4PW2onNXOji ajjGv7On2GV/HH1bE1w1eYxNwLe75G9Lj7ElzJeKQ6FApiEqZ5vpWnx/KtOy30mOYNXh d13cr1EbjyTWnPacRB0MyUSEZ7ak+Kw2aNrGUcrgVrZ1Ixkgv06G5BmNX50pnwAEQpUR 1JaTB3lM+OTB0zYLeuK4Vd7dfariXVj0rt7+gzkyP0HuyjBTJN4gWfsytwB8rF4GF//w A0KQ== X-Gm-Message-State: AOAM530UXGhOy628k44EpKW8opzeT9kg3luz60KC5OMj60/KbBPMu1DE aIVFNEPMuwnJmYT7ev5p6ukFs7Y8GkbwRQ== X-Google-Smtp-Source: ABdhPJyzBJMeNpO5LRE8OBFTfZw6voSpv6cYULYJu0EhlixbSKYMxQZGtmryub5De39lPHovshHPlA== X-Received: by 2002:a05:651c:22b:: with SMTP id z11mr1579887ljn.171.1606322038442; Wed, 25 Nov 2020 08:33:58 -0800 (PST) Received: from localhost.localdomain ([194.29.183.4]) by smtp.googlemail.com with ESMTPSA id c8sm316465lfb.98.2020.11.25.08.33.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 08:33:58 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH 4/8] mvebu: sysupgrade: write additional information to log output Date: Wed, 25 Nov 2020 17:33:37 +0100 Message-Id: <20201125163341.2681-5-tmn505@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201125163341.2681-1-tmn505@gmail.com> References: <20201125163341.2681-1-tmn505@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_113401_484516_7D1CB7EF X-CRM114-Status: GOOD ( 11.57 ) 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:244 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 [tmn505[at]gmail.com] 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 Message has at least one valid DKIM or DK signature -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_EF Message has a valid DKIM or DK signature from envelope-from 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. Signed-off-by: Tomasz Maciej Nowak --- 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 14d6b9144e9e..d353ec092cc9 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 From patchwork Wed Nov 25 16:33:38 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: 1406142 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=haF6qUw3; 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=DhwMb4X5; 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 4Ch62d4PkCz9sSn for ; Thu, 26 Nov 2020 03:35:53 +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=1AXxwb9oPNFHE52eavB2XeZAwz6WeZnMGb3oSTolzVo=; b=haF6qUw3A16LohWQnCnMYMHoar BtFL8uB+ZjK3s90dghcEcAv+Avn67P62r0UHmrV2O3L5MXGJbPYjKRnzeFwUenXrkBB44o7U9TWSs R8iPLOho9fQE3p+AB4sgVMYPH0aX0PxxH9Whjs7xdhGcQdfaK/VNtw0eRfx5V9vI+HbwTV4SRZLEZ 4POn5BGHu/c6buitS+PLvASjFr8blBU1HqLhhST+z/7/uZ/oYGU64VW5BK8ub0I2VcJFAaBDqDgPz V+30Es+2nrg4dVuzOTUiXTKLbYEshmDs2trWmroNwwnFMivzRi+IVv62vnpb2HlbtWMh1BlXJ79ET lAo2LGKQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxk8-0002NV-On; Wed, 25 Nov 2020 16:34:08 +0000 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxk1-0002KD-C2 for openwrt-devel@lists.openwrt.org; Wed, 25 Nov 2020 16:34:04 +0000 Received: by mail-lf1-x12f.google.com with SMTP id d17so3963689lfq.10 for ; Wed, 25 Nov 2020 08:34:00 -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=yHgDtpTVhKa1cdkH0jE9vWG2kpeTjODb/KASco3/dxI=; b=DhwMb4X5lb/Ri+3tyLqoYMzIM+LZy9srtbmFrMq1GzBMNsaJKylNl5c6hGCCHwVVJB MJKY0gGT/Y2XxPoAs2h0LReSuo79Z0VD2HRKJLpQkhOVHtI0kh4GrT0GC6LCjdO9aP8H SsJxtSzq8wlfpRNwmu1hHXTjJ95oB6c8CYFsl5MoteC+se9eWHWNzXo8YPmi37SFJX76 ebSc9GZV6bdR/3FVW67V98omyqD4ukakl6HKylKTJLlzKLFipJ+6E9kr5Xmn5dbrjtBz Qjot4NDQ4K7xXzDbVdU1i04HPdEMljuBlzUJVTwQjKc3rWJqZRUysY9eoWbht/eiNduW j6Vg== 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=yHgDtpTVhKa1cdkH0jE9vWG2kpeTjODb/KASco3/dxI=; b=RhUZXt5uE0Al5SSmVZhziIc0E5PXQ0+Db9skJehGs2po9OibvKegNzeoUA2G4gpV6b dnBCu2PvyOopPF0xRCP0NSf3ClYktlger8F0xEf9hTgQkLs982TPiWAgbHKakLkQIgpG mBHoeYLOfPLOJpl0OqW5Z5cDvb7fMu9lQ5zUfaDngumNETjkjVufu1xY+Kwbn9JyEmhq kpc2p9wONY0iS2v4QlKieqnY+WI1maDNKhwkCZGcdGyuPoEmlXVn1OXZkChYDudgwiuc hYcvgqCBc6gGrVQtZVDOYWv6+E0IAjH1iFPBk7LAAr0GaNo0g9BUoOSy0dDXv3kjN/SW 7vDg== X-Gm-Message-State: AOAM532irHUsSiK8FQf3H2gTZ/gT/SCWM0AVUEcw+zKw2cifh63UXHRE TlQS0XWDOHyShYYCVyQpMKv/xzLngQY0sQ== X-Google-Smtp-Source: ABdhPJxTHOiSAl1dsKXCFXm7bdLsj59Qs5aZxIhrOdY4chvt0qwDxtOAXRrxauSR7uhGTtDfBIF3iA== X-Received: by 2002:ac2:4c21:: with SMTP id u1mr1615660lfq.269.1606322039205; Wed, 25 Nov 2020 08:33:59 -0800 (PST) Received: from localhost.localdomain ([194.29.183.4]) by smtp.googlemail.com with ESMTPSA id c8sm316465lfb.98.2020.11.25.08.33.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 08:33:58 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH 5/8] tegra: sysupgrade: remove MBR check Date: Wed, 25 Nov 2020 17:33:38 +0100 Message-Id: <20201125163341.2681-6-tmn505@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201125163341.2681-1-tmn505@gmail.com> References: <20201125163341.2681-1-tmn505@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_113401_581861_98D8B4CA X-CRM114-Status: GOOD ( 11.08 ) 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:12f 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 [tmn505[at]gmail.com] 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 Message has at least one valid DKIM or DK signature -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_EF Message has a valid DKIM or DK signature from envelope-from 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 is already done by get_partitions. Signed-off-by: Tomasz Maciej Nowak --- .../linux/tegra/base-files/lib/upgrade/platform.sh | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/target/linux/tegra/base-files/lib/upgrade/platform.sh b/target/linux/tegra/base-files/lib/upgrade/platform.sh index ea9bbe92bf56..05b48cd50a8a 100644 --- a/target/linux/tegra/base-files/lib/upgrade/platform.sh +++ b/target/linux/tegra/base-files/lib/upgrade/platform.sh @@ -1,23 +1,10 @@ REQUIRE_IMAGE_METADATA=1 -get_magic_at() { - local pos="$2" - get_image "$1" | dd bs=1 count=2 skip="$pos" 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"' -} - platform_check_image() { local diskdev partdev diff [ "$#" -gt 1 ] && return 1 - case "$(get_magic_at "$1" 510)" in - 55aa) ;; - *) - echo "Failed to verify MBR boot signature." - return 1 - ;; - esac - export_bootdevice && export_partdevice diskdev 0 || { echo "Unable to determine upgrade device" return 1 From patchwork Wed Nov 25 16:33:39 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: 1406143 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=Xi75ROp6; 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=u6GaCMFR; 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 4Ch62f2rP3z9sSn for ; Thu, 26 Nov 2020 03:35:54 +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=kLCZgRSHZiOvCN0Jtl/SjeNJsQSdDlxFNDBXS691T0Y=; b=Xi75ROp6Tfg44hrzMut7n8aDie kGhZwbvPL6gbOF82Z0aqUhHJnifNmyN4VrV1Oe2gZFA3xbvUQQ7aD37U5EQ7ri6eKoyvmIwInUo27 gQVpqZDMdSeUEWkI6oDpscgqcRCYXyLNruqY2Mz7/7LLFtEe3ekh2L8wHafEnyIJ4BBjoFbmUSfwC BlnmN8EwQlPPNDXWfpb39w62JVH7WZ03Vzhbbu7Mupto4HTvQBDOr/Io+A6M3JxHTLIxqNNsLbZat H/pvYDKVnS9uYBhcJY1takWbPXafrn/ObQhE2ga5l1yCb6yaav1gz0bHpgi3Qj1kDs2Cygfrz281Y x7zDS2GA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxkE-0002OK-34; Wed, 25 Nov 2020 16:34:14 +0000 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxk2-0002KG-0H for openwrt-devel@lists.openwrt.org; Wed, 25 Nov 2020 16:34:04 +0000 Received: by mail-lf1-x134.google.com with SMTP id d17so3963826lfq.10 for ; Wed, 25 Nov 2020 08:34:01 -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=PobNRcsEHRwjXugnNrnNXyvP4hsLMToqpK/YY9dFUWw=; b=u6GaCMFR6VLSdqq9ErzQm7dMc2VAnAIYIj0AzTz7OJg4wyNCDTbPlWim1KVnct9Sp3 +oGbKMN/2rCChn0kQuKL9761ij0yoGz63C4WHdkqFRleJZylNR0iTSobWLLtoAVqxpYS zpIyW+Pyo1iKz+0s6rJ3QFgq0Jol3LACoQwNQdSNhU7elBs05WGEMdGB7F27OF4yISNc IF8ka/uCoF3LSsyXs6gqSBHWT+v1J2ZCuuplYhJI9zizW5LM8+6J9+pEqs831vh63dTt Z91om+u8+XgfAZq8OEoxsrciN5wt6fzlwbkDRC0iN7loTfvGfBaAIbuqQ0DCAvVzz9EK X8Qw== 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=PobNRcsEHRwjXugnNrnNXyvP4hsLMToqpK/YY9dFUWw=; b=dJrM9h6RuKbiumuqad+G5g5QBzIwkSDk9donYvGxzb4Z/nrnkxI/ptKyIpv2TGN+WP GPdo/sc8vxXTAj0E48p8cd0rZrolLas+8cBKe5b4/pW8rrfrdeMbRA35g2VodmnMN/tn dX0Q9ulpvAmqb63DIKARi/9NR7DnhvR0yqEzibyOU42l3bIOtP1sBgcOyl+EqH6ZXX2K ZZL4VyI5WBHUiCeNt4u3YxBZTWa4uqIx5F8zhXBEhsqzO/Rz8N05l2qqrfNIQ0Gj1Jci A4WN5l5ljTM5uEUoR23u+0VVVRJLGRz5KApXiAIdA+BUgBgXwMjI/lWuHAyWsbVK7TkP Mn/Q== X-Gm-Message-State: AOAM5328OVpI94UIEAE8hUDePNEA/+QVJkC1IIz2HM3TCJMv9+LsVsAh bFQfidghzPcY3UwsHMZqdkJTOGQBiD03Ww== X-Google-Smtp-Source: ABdhPJytGFX4jB+6ldUyluH1Cb024voU5hzLFY6RNUk48eJsOABdcL2NVxkVY5zjotqErqfLYlSxXA== X-Received: by 2002:a05:6512:314d:: with SMTP id s13mr1619707lfi.464.1606322040115; Wed, 25 Nov 2020 08:34:00 -0800 (PST) Received: from localhost.localdomain ([194.29.183.4]) by smtp.googlemail.com with ESMTPSA id c8sm316465lfb.98.2020.11.25.08.33.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 08:33:59 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH 6/8] tegra: sysupgrade: use v function for writing logs Date: Wed, 25 Nov 2020 17:33:39 +0100 Message-Id: <20201125163341.2681-7-tmn505@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201125163341.2681-1-tmn505@gmail.com> References: <20201125163341.2681-1-tmn505@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_113402_091645_BCB9FE8C X-CRM114-Status: GOOD ( 12.68 ) 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:134 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 [tmn505[at]gmail.com] 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 Message has at least one valid DKIM or DK signature -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_EF Message has a valid DKIM or DK signature from envelope-from 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 Signed-off-by: Tomasz Maciej Nowak --- .../linux/tegra/base-files/lib/upgrade/platform.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/tegra/base-files/lib/upgrade/platform.sh b/target/linux/tegra/base-files/lib/upgrade/platform.sh index 05b48cd50a8a..5c729de1a4b5 100644 --- a/target/linux/tegra/base-files/lib/upgrade/platform.sh +++ b/target/linux/tegra/base-files/lib/upgrade/platform.sh @@ -6,7 +6,7 @@ platform_check_image() { [ "$#" -gt 1 ] && return 1 export_bootdevice && export_partdevice diskdev 0 || { - echo "Unable to determine upgrade device" + v "Unable to determine upgrade device" return 1 } @@ -23,7 +23,7 @@ platform_check_image() { rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image if [ -n "$diff" ]; then - echo "Partition layout has changed. Full image will be written." + v "Partition layout has changed. Full image will be written." ask_bool 0 "Abort" && exit 1 return 0 fi @@ -43,7 +43,7 @@ platform_do_upgrade() { local diskdev partdev diff export_bootdevice && export_partdevice diskdev 0 || { - echo "Unable to determine upgrade device" + v "Unable to determine upgrade device" return 1 } @@ -79,14 +79,14 @@ platform_do_upgrade() { #iterate over each partition from the image and write it to the boot disk while read part start size; do if export_partdevice partdev $part; then - echo "Writing image to /dev/$partdev..." + v "Writing image to /dev/$partdev..." get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync else - echo "Unable to find partition $part device, skipped." + v "Unable to find partition $part device, skipped." fi done < /tmp/partmap.image #copy partition uuid - echo "Writing new UUID to /dev/$diskdev..." + v "Writing new UUID to /dev/$diskdev..." get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync } From patchwork Wed Nov 25 16:33:40 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: 1406141 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=IxuqtwMi; 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=rpdjrIZ+; 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 4Ch62X73lTz9sVD for ; Thu, 26 Nov 2020 03:35:48 +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=CSNmZfUQGgVI+Vq/LgswnYnOxLGn3Kr9c7q95dCSCLI=; b=IxuqtwMikIelOebE+thm6AV/9J vbK9Qvf8CJ7vaa/UEmYt3rpDbFUjtZitysqROFwBcYMXnggYiMaCsjFZxmza7e4CmcbgW3qGqAykE Pb5e4X4XObBQgUw9nTw5ota9f+m4Uwmvww5N9Iivly3kvBRx+aZSd6HjT4kYc2VM0hKJSHNCxWEIB +XP4ljOqvLEFxloQK1FMjCiasVpaSRj98tIGSfkdvJt8iyuDdbmZbxa3+iPh17zFvniyONgzwYtpq b+KwoPSwxDYIfG/PKXf2SoFCIrd333tpQ6dbyO6mPKlSohxAEc960p8cNMXH36LzaWjwCGF/5wLy5 jops/toA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxkA-0002Nl-OP; Wed, 25 Nov 2020 16:34:10 +0000 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxk2-0002KH-0z for openwrt-devel@lists.openwrt.org; Wed, 25 Nov 2020 16:34:04 +0000 Received: by mail-lj1-x244.google.com with SMTP id y16so2963876ljk.1 for ; Wed, 25 Nov 2020 08:34:01 -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=fKRkx2BbaSbuvmOTC1t+LI6qHfu8zlH5yRAQYiuqgfg=; b=rpdjrIZ+a7snTT+gExudg8UkvNLMmvdElCVX864OjJCRe6zlVJC2ruNGOp/knROwNH rHpr2rDnODWmiyXT4owHyiWCvv/043vgs/KzXGALnsNMzBCRqFUDcW2jufC5uyiL8YXl heOOFnR2A7QTwIuLMVb9P6ma9NsCy9g3LUc1SGRsf2IM4tstfxk6Bp1qCYOpi613fhhS JoBbnFhMHBWlOMjS7/+f6zBzJFPSv5c9lKdypwTIGQIsvy+02rVJ9amVvn4UWttRyeWH WRSpCKWLQFRXgx9OclUv1c+qmgP5C6VWgsp28lBNsx7758eixqfXOAKS0eTbCYGaL8/O 5RTQ== 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=fKRkx2BbaSbuvmOTC1t+LI6qHfu8zlH5yRAQYiuqgfg=; b=NpRQ5jj6rhyTxusOcBMdmgW6hBGCnGd4PhxLyMCGfGPrioRqMBZT2lxFwyC8TWaBU+ yvJPg3g50G5Vk4Id0fKk6clWnl8qW86o3HMFuqkJGWUZqUIXbNqYxDzG7lguASLCrJJC 2lbfM73FwIm+Ma0w/u1yxvVr/LwuY6xAFwefUQ/ec1jTsk5VzoDiE2gK8D1JhW+ByoBP ZPVrby2V3xyFVmBcZs/ia+G6c7IlCA6Jiv57WMQYxESiS9RAekXz3uwP1deC6sdah55w 28f1wJIe0GLUoUL7j9MwJW1nRbeYvQuRPZBnioDEbrAAX4ipXh1u+Z99l3YNUCbGJ3u4 0EQw== X-Gm-Message-State: AOAM532oFAgtdset1jq22d0yIB1zvqxXH4bWQ54u+BD7247k0iB2QDyP 7BxxkhbrRYydGSGcf2v7SxQ8NyljMJcK/Q== X-Google-Smtp-Source: ABdhPJyxRJa9XmLXTKy513az/GRnnRGAEkadKvtR/0ZqgB798Bc20oCcgHE96/De1VkSjQz8lHPegQ== X-Received: by 2002:a2e:7306:: with SMTP id o6mr1621979ljc.306.1606322040796; Wed, 25 Nov 2020 08:34:00 -0800 (PST) Received: from localhost.localdomain ([194.29.183.4]) by smtp.googlemail.com with ESMTPSA id c8sm316465lfb.98.2020.11.25.08.34.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 08:34:00 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH 7/8] tegra: sysupgrade: use get_image_dd wrapper Date: Wed, 25 Nov 2020 17:33:40 +0100 Message-Id: <20201125163341.2681-8-tmn505@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201125163341.2681-1-tmn505@gmail.com> References: <20201125163341.2681-1-tmn505@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_113402_118939_A7B93889 X-CRM114-Status: GOOD ( 13.35 ) 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:244 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 [tmn505[at]gmail.com] 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 Message has at least one valid DKIM or DK signature -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_EF Message has a valid DKIM or DK signature from envelope-from 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 function eliminates false-positive erros emited by dd. Also remove check for number of arguments, as that's not needed anymore. Signed-off-by: Tomasz Maciej Nowak --- .../linux/tegra/base-files/lib/upgrade/platform.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/target/linux/tegra/base-files/lib/upgrade/platform.sh b/target/linux/tegra/base-files/lib/upgrade/platform.sh index 5c729de1a4b5..715d1c1b8046 100644 --- a/target/linux/tegra/base-files/lib/upgrade/platform.sh +++ b/target/linux/tegra/base-files/lib/upgrade/platform.sh @@ -3,8 +3,6 @@ REQUIRE_IMAGE_METADATA=1 platform_check_image() { local diskdev partdev diff - [ "$#" -gt 1 ] && return 1 - export_bootdevice && export_partdevice diskdev 0 || { v "Unable to determine upgrade device" return 1 @@ -13,7 +11,7 @@ platform_check_image() { get_partitions "/dev/$diskdev" bootdisk #extract the boot sector from the image - get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b 2>/dev/null + get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b get_partitions /tmp/image.bs image @@ -53,7 +51,7 @@ platform_do_upgrade() { get_partitions "/dev/$diskdev" bootdisk #extract the boot sector from the image - get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b + get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b get_partitions /tmp/image.bs image @@ -64,7 +62,7 @@ platform_do_upgrade() { fi if [ -n "$diff" ]; then - get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync + get_image_dd "$1" of="/dev/$diskdev" bs=4096 conv=fsync # Separate removal and addtion is necessary; otherwise, partition 1 # will be missing if it overlaps with the old partition 2 @@ -75,12 +73,12 @@ platform_do_upgrade() { fi #write uboot image - get_image "$@" | dd of="$diskdev" bs=512 skip=1 seek=1 count=4097 conv=fsync,notrunc + get_image_dd "$1" of="$diskdev" bs=512 skip=1 seek=1 count=4097 conv=fsync,notrunc #iterate over each partition from the image and write it to the boot disk while read part start size; do if export_partdevice partdev $part; then v "Writing image to /dev/$partdev..." - get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync + get_image_dd "$1" of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync else v "Unable to find partition $part device, skipped." fi @@ -88,5 +86,5 @@ platform_do_upgrade() { #copy partition uuid v "Writing new UUID to /dev/$diskdev..." - get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync + get_image_dd "$1" of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync } From patchwork Wed Nov 25 16:33:41 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: 1406137 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=Gz2PeMVT; 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=feeOzEha; 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 4Ch62S3YXBz9sT6 for ; Thu, 26 Nov 2020 03:35:44 +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=W1pZbeNR1jzCEutRrqFf5lfkYWkoXfdK9hM6xA16kf0=; b=Gz2PeMVTdVSGl297AslMj5RPXD tJp5nXtLE0Iy+T07nG0f6a05JO5xSd5a6IKvF+/uqsqhRCgiZsCJES31se19ApUo1bi1VcKL1hC9E Qz/zpDz2gP6cTIWK3EeWJuetz+wN7fEFcEgd8HnGKRzBwRYuLCwKu6uWLN73nk8QLYKdsewwNOULi a32kJDgbr/Vp5XxbfvtD6lg24nVBG3AXsVlv6MRsKywaWQsGiLsM4cFNq8WFYuFrS9Emg1FPqscaF ah3X+21zc3oEiXB6/tnb0LRmeZfOXefxOQF3+aLviBcQ+h6XZpg8XYFsTML9DPr0QOkel6WTGxy2e xUyN11zw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxkF-0002Oe-Py; Wed, 25 Nov 2020 16:34:15 +0000 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxk2-0002Lc-Tm for openwrt-devel@lists.openwrt.org; Wed, 25 Nov 2020 16:34:04 +0000 Received: by mail-lj1-x244.google.com with SMTP id y10so2930780ljc.7 for ; Wed, 25 Nov 2020 08:34:02 -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=Rqj3NfGbQPxoDmfLArIuJ4rWy8ypZ/KBa8BvfhOL+Xg=; b=feeOzEhaBxpDMkM/P2rXzjynnWSgc+CSTXl7oHT/CmrOrFd4MZu2yE3Jx7FKupbWQm Zo2+42Sf2mQjtOGO2GKwpQXetCRoUriNjoD7fkHdDAUeypCdr7D2DbUh6ZGg8kT+Ke+0 06YSk2THOCPQxPAO8qlPVmM9Ve7zvPgbWmGSXNkWxfWzUR43/m2qVYONyqWCYIqpckPz h8xs5zlujH9xl2Rnzu6sRHBhL6tPKXMTSlyoV9eNYYlMdyt6/cGrh+uh+4x3YtBFFfGD c6Di2FD58vXMSk+QroxUgGaD+TuyTOkosJ6erIF8C0YMJ4mqaAPhyMsaM6b/V4FGNoRR t/1w== 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=Rqj3NfGbQPxoDmfLArIuJ4rWy8ypZ/KBa8BvfhOL+Xg=; b=c+9noyWgWAsSbnRYRJKA0Xv0CcX86SMtwFuptXAkluFJ3Q3CZ8XtHhQszL/2uxcwx7 eSKlKl9xGTF4yIZwhPSsLWXqIP5XbbKYlD4+cgB3/hXP7WEdDvdsNeqxCEiY3HBw925q GZJJlKE+RAEMTYRB1IsnNO2cZAa1eNvdpsU7AvIs0AVbP7xkdXpYMHjE2Ubvf3kFw6uh grh99MR/2LhD7bIyraW4M6zYL+l0vca5ilHzDRXguPMT91ZCQYd/3948xg0N9gR4+voE 1cBUPLqEg3GzpX1M0lGQy6vnFOaiGfTNF7Kf7tbsfhWsmRnCLX15Jnqkp7cF+RhmQg8W qzUw== X-Gm-Message-State: AOAM530V/fwk0H/vEvdoY5J1x4SCOqQae/gtpebWKZIm4G8gkhzallZj LWKI2xvp9kHC0yeBcMCHQUWyIRMrP4c+lQ== X-Google-Smtp-Source: ABdhPJxTeCbEZxOzjkqdMNNfd0cR2rweN3xkwyBXa+9HNA7KfoiHYb2JqUJvacCpOLBqSB/1cXGtDA== X-Received: by 2002:a05:651c:1195:: with SMTP id w21mr1681768ljo.427.1606322041708; Wed, 25 Nov 2020 08:34:01 -0800 (PST) Received: from localhost.localdomain ([194.29.183.4]) by smtp.googlemail.com with ESMTPSA id c8sm316465lfb.98.2020.11.25.08.34.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 08:34:01 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH 8/8] tegra: sysupgrade: write additional information to log output Date: Wed, 25 Nov 2020 17:33:41 +0100 Message-Id: <20201125163341.2681-9-tmn505@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201125163341.2681-1-tmn505@gmail.com> References: <20201125163341.2681-1-tmn505@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_113403_016861_CF245115 X-CRM114-Status: GOOD ( 11.83 ) 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:244 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 [tmn505[at]gmail.com] 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 Message has at least one valid DKIM or DK signature -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_EF Message has a valid DKIM or DK signature from envelope-from 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. Signed-off-by: Tomasz Maciej Nowak --- target/linux/tegra/base-files/lib/upgrade/platform.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/target/linux/tegra/base-files/lib/upgrade/platform.sh b/target/linux/tegra/base-files/lib/upgrade/platform.sh index 715d1c1b8046..170bc11ba709 100644 --- a/target/linux/tegra/base-files/lib/upgrade/platform.sh +++ b/target/linux/tegra/base-files/lib/upgrade/platform.sh @@ -10,7 +10,7 @@ platform_check_image() { 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 @@ -50,7 +50,7 @@ platform_do_upgrade() { 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 @@ -72,7 +72,7 @@ platform_do_upgrade() { return 0 fi - #write uboot image + v "Writing bootloader to /dev/$diskdev" get_image_dd "$1" of="$diskdev" bs=512 skip=1 seek=1 count=4097 conv=fsync,notrunc #iterate over each partition from the image and write it to the boot disk while read part start size; do @@ -84,7 +84,6 @@ platform_do_upgrade() { 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 }