From patchwork Tue Dec 1 17:29:13 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: 1408956 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=T2SYbgK0; 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=Me9afDau; 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 4Clq0b6TH5z9sW8 for ; Wed, 2 Dec 2020 04:31: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: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=onBxHYxHrsEn/81UfOE8TkgVtW69HzK22KgN1SRzVSU=; b=T2SYbgK077EaSHBP23PvfE8OFO ljgWF74aXWEFxewSHSd/jnd5LDTBW/Dz2xYDUk6tXHsmubuZB+DwBqjZS95PugdtT1qzG6BinTEBt 7gxZdRrSULWypG//i+K0ffpb0BczVkgEhFnJOmdTq9eylpYkToxlcsjpqFUMPzZrTCH31vepp9+eJ +qlQi6uBdUiaDy4AB2qGFhhhID8zhEe8HUkJ/GaPvv1prG6M8XaKx7Um3nlBmZjjAyO/YX0V7eghM +yJKQihPs/sVEN3a75Bd+VRLAqLFVGqeYx3mFr31hU8XbcwAU/7OBOxnaG9kH3WrUbnEr1PBOAzqJ u8iu8YXA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kk9T1-0007kg-V0; Tue, 01 Dec 2020 17:29:31 +0000 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kk9Sx-0007ib-Ux for openwrt-devel@lists.openwrt.org; Tue, 01 Dec 2020 17:29:28 +0000 Received: by mail-wm1-x32f.google.com with SMTP id a6so4899111wmc.2 for ; Tue, 01 Dec 2020 09:29:25 -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=wnIRLc8INwYDSmB9ShXGTpHlZEk2LpwunFYtaTU/Ksk=; b=Me9afDauW+sIOQr5ANWHvr9QqKnEWdKBmQFrezTf9CZkkEk2Q8udMBMTYbt5BkPMoj oUOTPDB+P2HPfEixgPqNT/+qa6CS6npkbHmZx2r9ciP6Wl/A0FHrg9oQGGSA1Tt3ZHch BtJgSsvhIIZI96koEkeAu2uQwN2p6nTNEadB3EOZkp28bczZFEdfAVl7qX92QkMJ2PoD GfNwG61vUR8cn0/R2quDgq40evw1g73eIptlmJ/XlQ+8nocDtdS8w6JUlHh4f/TvgwyU KdLZvjRTkKTv9mfqaWLAr+vIAzPJyN2mPg4OVKg73uDbR3OFjLuwwoUreufTBbqq5E+b OGhg== 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=wnIRLc8INwYDSmB9ShXGTpHlZEk2LpwunFYtaTU/Ksk=; b=K3PBCqh6ciZurfH5iS7j8pSuuUd8I+nZSzTEknJPvLdpe61lWmhlIs81OPMIG53ZAN NwEcYEgJD1AhDPDpF4l1gQT4cFLEy7UpbJkR423vMGB3cQ9FDJ/Hs0hdmzNoPaiILeVy SMhTSbkG9Avkin/9GRajmpa1OgZ4c01rvnnLQc1TKeXL0E65cRFAkFsxm4VxCz50Wiqu EuI4Xz+STqN5I/K0cCBmhMHgv+kzIl99HeErsG0/kDd19l1hviTogKJzRbIf8B2ALuN1 9Gs8+MSegyNq1BLjmZ+lpxhosHXbzRplZsMHNh5LrYszLqBSBHiBY6o7Dc+e0Npj90Cx 6Wvg== X-Gm-Message-State: AOAM532ZWLV8NuQCU7hSm15PpPjauKUTgaOjNkdI4tL0kqEY+sVDmm5P peKl/gs1ldWufNjveZIaSRH8CINPc/rxEgel X-Google-Smtp-Source: ABdhPJzzwba6pjthWGKqqn+FslgYdm9lnXTBsy+ecqvmpoSDB5vJVHoK4VN+WMfHCK44ASl8S7mQlg== X-Received: by 2002:a1c:a185:: with SMTP id k127mr3878231wme.23.1606843764784; Tue, 01 Dec 2020 09:29:24 -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.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 09:29:24 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 1/5] tegra: sysupgrade: use v function for writing logs Date: Tue, 1 Dec 2020 18:29:13 +0100 Message-Id: <20201201172917.414896-1-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-20201201_122928_031071_046D98FE X-CRM114-Status: GOOD ( 12.74 ) 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 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 -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:32f 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Sync with x86 target changes. Signed-off-by: Tomasz Maciej Nowak --- v1->v2 Add commit message. .../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 4dd049519c76..4b39b3e18230 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 "$1" 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 "$1" of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync } From patchwork Tue Dec 1 17:29:14 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: 1408957 X-Patchwork-Delegate: ynezz@true.cz 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=KJQO3Fkc; 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=VVenvlxm; 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 4Clq0b5JJGz9sW4 for ; Wed, 2 Dec 2020 04:31: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: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=QwuaqMbRRXgV8Od35a8lOdXalEzKYD0DSnOGIxPB3OE=; b=KJQO3Fkcv0gNi25Arq5T0T/CHE 9j5+bCx1GFOuprzO0A4gJPi/7wyYR9UObdXLtU4J2l3pmbpdUhAKj+LPJghznL3cDxl726SSEMUja LJFRpeppjUJY/Bacyghab2EbDAgSf0JzJ2UBgkp2Cp0JXapv5fYsE7yiSPDT0EED2xn1qIObiQ783 fzbFykhq79zy9oSDUFA41bXkzw/iJkEY7TsHnIQDgIn4KobXqomtc1E/AY5bjkqp5AqFDitvMjAAC Y28q2xLCoJZJNPcYfwdLvQjGhjxisM9EYSRV8n12mmGzWMCQYvbBF6NxACAxvIMMVSVGneWngcKqB aw36sRrA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kk9T4-0007le-0s; Tue, 01 Dec 2020 17:29:34 +0000 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kk9Sy-0007il-P6 for openwrt-devel@lists.openwrt.org; Tue, 01 Dec 2020 17:29:29 +0000 Received: by mail-wm1-x330.google.com with SMTP id f190so7299222wme.1 for ; Tue, 01 Dec 2020 09:29:26 -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=HMiyQDlhRIf+M1u8QoX6vAp8vSXdgTSMFL2PIt+QtcI=; b=VVenvlxm8p6P1NqBGM4/Qc7fSLCGXDx8+A9cEHctnOF/ZjXXJzjueyGPp7e66oy0VG wQ0AnyH35rmyMx1GTc26glZMCbxaCoeQeTGnKgKaRfY8upVwuFioXswsXkovCZkD45LJ F0DXucZ8Q9IFNQZkkLGxCDYlE1SL79pLHw+1rp+qMpjcRrK3MQTNgXFehiz5tP/c3u2a uYYIskA8IERHsdqDRLYH559sOBy0rGhpyQO1RpcMm0Yj8tsQUzEmXAr60goQO1dO3jxJ 2xIFVB2TLCdnUyY0bXk/HtjRBVPOZzw53eLRARxsC20JJfjRXaaDNXD1gpZhtl40XrxM yxPg== 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=HMiyQDlhRIf+M1u8QoX6vAp8vSXdgTSMFL2PIt+QtcI=; b=US6BbP54YhkEzTNvkris9XCI9P+fzVnpIFPwld2RbVBMI8MP//wXTW5oc1D05Mxzgi 1E19wA5JQoIKBnfo80NIfBEBtEShb6TC0/GbOaGbGe3zPIDL8BY4isV62zmuQQpVjA0A aVen/qRan/xTpWs6GsRYRyXMZ0OkL/eKqxnh57alG8hWgfJLw254dVhVegQ48QolF1At a/rchYaPlUncl5xnSwwJhKZdhnjyrDlH+1hl+oa6ozFM/AHCRwCmyocR3RwF6h9fmjdZ fCz3iab2UA+skiDGYRlEqHIzTIrfqxmiG+2UWYkRnilaC5bAcV/8xus4zKGmKCmzr3Mf zE6w== X-Gm-Message-State: AOAM532JAObSAuTnxujWo/12bxijNuq9DG+sRguZNXyCI4pAbcOMgoLY JTpg6K0mIJ48/HQ2UcnpRbLcF7Qv4CtrPifI X-Google-Smtp-Source: ABdhPJwm4oD1SZfZJB/bnSoc/JkeR+4EEehjgfkMHgJhV4m1Mi8JNsPaXIZkMB02I4M87YRIp13Dyw== X-Received: by 2002:a1c:ddd5:: with SMTP id u204mr3814324wmg.174.1606843765672; Tue, 01 Dec 2020 09:29:25 -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.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 09:29:25 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 2/5] tegra: sysupgrade: remove check for number of arguments Date: Tue, 1 Dec 2020 18:29:14 +0100 Message-Id: <20201201172917.414896-2-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_122928_862854_1E53AB09 X-CRM114-Status: GOOD ( 10.89 ) 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:330 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 chunk got mistakenly removed from 30c95c4, since the get_image_dd evaluates only first agument, so that check is useless. Fixes: 30c95c4 ("tegra: sysupgrade: use get_image_dd wrapper") Signed-off-by: Tomasz Maciej Nowak --- New patch. target/linux/tegra/base-files/lib/upgrade/platform.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/linux/tegra/base-files/lib/upgrade/platform.sh b/target/linux/tegra/base-files/lib/upgrade/platform.sh index 4b39b3e18230..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 From patchwork Tue Dec 1 17:29:15 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: 1408959 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=I7XSv+3v; 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=q2D2Pgb0; 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 4Clq0f4W5Vz9sWH for ; Wed, 2 Dec 2020 04:32:02 +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=wtS78zqxrLXS6TzLRAniq+SCgpidYP6P0/WwOdBHoh4=; b=I7XSv+3vNBzrvpsOMeHd0uHbEq gfXoW/F0Kpmab6BCp5ULX/fl0ziYIQFSwnGC6vpJ88/2Bs4fp2UVh1vESAoYNnNbDmiq140P7zTMl OfnakIObVUtCLcaKYF9YYUv27Xdnofi7QGMDJaXo5bmg8qVnSL1en8DPgqfrc+op4B0Ovi91JGbwX tP19mTIC54jMr3rm0JTrAUJ9Fhtzp5OS4zUT5BNmmvtKxb0VdUhil6plkMgjwMjhIjBWI8GEvywNZ ug5t68o+/mbtZ1Aiw+kxIHeEPKZsahX8LD4UKKOxgsC8sk2u6mJzVgsJ3wPXDUN7jrWrZ4MvOG39U QGPWAGfw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kk9T8-0007nE-3d; Tue, 01 Dec 2020 17:29:38 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kk9Sz-0007is-CT for openwrt-devel@lists.openwrt.org; Tue, 01 Dec 2020 17:29:31 +0000 Received: by mail-wm1-x344.google.com with SMTP id x22so4883075wmc.5 for ; Tue, 01 Dec 2020 09:29:27 -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=IjLs5t3c1bwfTILXuSbWyNi6whtyFC3R1sbXpn7Ogjs=; b=q2D2Pgb05KeKEYnV9RDNJqMkNh3OGSuEOjNcuR+zCxQqP2hvOii3dVDZxmLZCxIkhD pGiJ5zf5X/CjsKk3JsBpGmEv4IaFuIg/Pi3N3A1W5n0WSSqDFOmC+5yYKdXNqRiU/BST 3vCaLIh/5vcgQuZPHbCZ0ZJD8BXnkMQ2qSl17mZIppIjPJ9bKE9N5zxGu15dY6KbqNNW nANHN39+Qv8rBBhMKWqhIVMhEDpIsU4CWjRwRu1sDa+MJlaD8t6zw8kRKF7XAEWblyNl 1HC5Xh/IU6y4d4gFsrGZ3reBQC4HqWvpVoVPdEOm48G8RNcTskjILuPMyl0khI3r0MhW bM7g== 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=IjLs5t3c1bwfTILXuSbWyNi6whtyFC3R1sbXpn7Ogjs=; b=iGxp6+pxr823G7lCbrC+cNqEkKxA2fvK9QKikiHkaODWnQPJpmn4mKhaSinZetf/J8 HqAyqJiS4tyVqwMs0HEE6xpWiiCBZzoNSBqsrG9GdV6UwRxDGHE1vAFlHooDVAi4BaWN CaIW4TQbOjuxji7KcIRn/TJoduhoX3gv7lqgEf/1UpD/skaInc5BIkLGnHpygMVulOTY Ai/B+cBWCs3/ofRq4wMk6/2mqNS9vKLFSWyEhgDgDrl1obNzsPCG/XOb/vfT854bpLS3 wM4SV9FzPQoiGNd0xdQEGI/RwQJrcjXmLgfB1LR9tLopqZ0ocLNDhaxr1sp8wRDpLh6X Ju9Q== X-Gm-Message-State: AOAM5309zCWPgcLE2P4S9Al2F7Gw6ngJiUy6R6aI8UDY1PwzuVj/IeYK Ztxp/yeZwf/+NuDIkJ4vsqAlJN+f02RKfqOu X-Google-Smtp-Source: ABdhPJxUaDoi8Bh6aXBn4XZ0EWkrpRUOVrEMj0YbYCibgG6fQo+KZ+I0e8uul/vtqqgd7ASjC/o0xA== X-Received: by 2002:a1c:55ca:: with SMTP id j193mr3802286wmb.87.1606843766586; Tue, 01 Dec 2020 09:29:26 -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.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 09:29:25 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 3/5] tegra: sysupgrade: write additional information to log output Date: Tue, 1 Dec 2020 18:29:15 +0100 Message-Id: <20201201172917.414896-3-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_471817_6372343D X-CRM114-Status: GOOD ( 11.89 ) 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:344 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/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 } From patchwork Tue Dec 1 17:29:16 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: 1408960 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=ARnrrNqd; 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=YY8vPGtn; 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 4Clq0j2xcYz9s1l for ; Wed, 2 Dec 2020 04:32:05 +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=K6/OSuH9lPVVNmfpO5aBlrA9AcXkYPu7ZuFZy2mxH/U=; b=ARnrrNqdwBU2VIyqkvme9WhiUn usyVpmRZnoS0X0IRODDqos72jTrBhRCDYHBUyv2/EA/dP8pi9FBnEzh+nz37vYOpHu35AzVQce6X/ yCxC75pKVfRU95iofIcq2eXFDMo4yi5a8NMeZ8OfVTcTygp1OdAVmvZYWAI9kgngYJ8DWlU7aZstD afyWcGXoxvPHtU211mh4mnfeqg46SDwCZIRipgZTqfFKzhsde5A58OW4HaW50o0GB2vCWJYx1Ynu+ SQVs7Mn3zHDs09L/TVz5dIfLOUZNmcOOZ7vVbahhddQSmqM5M294qS6QBVSFi82dmM71p0EkN5UnR 9EaESUJw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kk9T6-0007mO-0P; Tue, 01 Dec 2020 17:29:36 +0000 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kk9Sy-0007j0-Tr for openwrt-devel@lists.openwrt.org; Tue, 01 Dec 2020 17:29:30 +0000 Received: by mail-wm1-x335.google.com with SMTP id c198so4912119wmd.0 for ; Tue, 01 Dec 2020 09:29:28 -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=IEyrPoKII7PB8BfclZGyvowANMc9LjC0ZjQGOyU2FXQ=; b=YY8vPGtnB//cBQwO89N2sVq5S4m9y2IzmlGoowbFubQcKYBzG91no+LBHcWtf20v1z AuPw5Nhec4LF9I2nOjxsTp6MXRIK4tlvQzzf4cCV+8T1nG6VA+k82rwd+ceAMn9lrnIx pGXvP5ysQBSG5TNtfrXNpJOJ2uhLj93gQYv7TNVggkAP73EobcHsz6WLigj0ASfZK2Mb 20u5vHxoX4VM3KRjeY08pLz6JcfPcZ74+e/ua3mYxihcyEwX6yaQ93R1oY/NRTOidoYm wuRtdOV5zLG9nIx1hF6Ws4+Xc+mjVAf784R5h49igwOu8Je6gVXA4xptqhZ5Wf6JGewx lWRw== 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=IEyrPoKII7PB8BfclZGyvowANMc9LjC0ZjQGOyU2FXQ=; b=ISncfs8IP5mmmA/Csa3mxMb46O2LELNNm1BxC1j9NVIJS6EwpFlgBzYZewxoKsEyAI LttmiKNh1Kks2FYmTPmqQ2vPHTW+cTGxougMh+varMFgOyDtH55ri9ePvZ/Pxey+8zb7 bgWrkjl2JxCilIOnmzD/bAU/OiX6ahE+2kKLhieHGopszRkR+d1twm/nEKOqZ6TyhSH9 Dr0L7A9P/ckRBxa3G7Y//qAfAkYktgFpWsek0K4VqT6xjIa7WJVxfbgzSoFJY7XBTA6g oWmJyda+bqx/p5BHF6X39pJgdN+zPE+Wfb7ScHjyNEg7KIuFmo0RKe8foESabVHVyCtU h4pw== X-Gm-Message-State: AOAM530IgDkeGgr00l6gJUXLO1RgcVJEE/xDYfgWDjo26ajADRHyxo+U wGYGuJetaZkwvzsdNbwgmEHzFVfNy0UORbrh X-Google-Smtp-Source: ABdhPJzafU1fw4p2HrXafLwdlf1VXZzJaKpdpT5SQ4LkFCJH6xGaebdlUJKDrbPpX0nr4xVAGx0kJw== X-Received: by 2002:a05:600c:21ce:: with SMTP id x14mr3801358wmj.27.1606843767442; Tue, 01 Dec 2020 09:29:27 -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.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 09:29:26 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 4/5] mvebu: sysupgrade: use v function for writing logs Date: Tue, 1 Dec 2020 18:29:16 +0100 Message-Id: <20201201172917.414896-4-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_020616_B21DB485 X-CRM114-Status: GOOD ( 13.25 ) 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:335 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 Sync with x86 target changes. Signed-off-by: Tomasz Maciej Nowak --- v1->v2 Added commit message. 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 ed332bf3e3ec..0f95b1b65971 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 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 "$1" 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 "$1" 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 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