From patchwork Sun Jan 17 03:11:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1427680 X-Patchwork-Delegate: nbd@openwrt.org 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=1sBSKuJ3; 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=jJjcv2D8; 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 4DJKk04cXjz9sWF for ; Sun, 17 Jan 2021 14:13:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=UlC3A9jfnPR/23rrm28lO17jGsb2zAFeDS1Q86wX8fI=; b=1sBSKuJ3QH5GnvgvdzVgkTugEn 818SOrq/mPoEYp7n6dV6stPslhC2pfdKOCHpb/hpYDVwgLmg2OOor9+lOYS6pgVuZrHkdodrSfZTb nj5fQUAhjPMylSXmxfqRWd7dh0TYR/Lvd8y2isN0Vbt1gJJABmqBNBd1U0pJUBLNPGXPxjUP2m/tq X6BCnYV5kdXA4zvx8UuJO/jY77CeJYRhjuaXuW91cSPWF1CiQiPieg7Sk/oUdt6USTwSKzYXCMOii MGcMpseXOkechCV247hFSQSm8J9jS6zHWhDyKBWaQOZTj1W0NKdHdEuslcVxeC70iDqsqB7NLpD5e m0HwNZig==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0yTL-0004mV-R9; Sun, 17 Jan 2021 03:11:23 +0000 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0yTJ-0004lc-C7 for openwrt-devel@lists.openwrt.org; Sun, 17 Jan 2021 03:11:22 +0000 Received: by mail-pg1-x533.google.com with SMTP id i7so8749829pgc.8 for ; Sat, 16 Jan 2021 19:11:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MnZOxUqx1ZT4Touh5z4fG1R1/mOzW4p4SPu43dGrv5M=; b=jJjcv2D82JV6DtcqyZyYMjdea6iUSUeWJvKOiIBrx3kr9SROAGrvHoOpiE03z5+w/D TfShX29ruKnHWwnzydNLV868jK5h7nY5CUDFUvxtA6EvADh5Ukn1+VqZsQQmsQE3OAJt LtDzTDhwRF6DlFy32yfgS0azs8BwFIe62PQrgIV0wfwXTEQsjldjkEZ3nIFbCOV2tfaA FTMYYa/tKumtsO/qobnHjS3q4mss0BvbMR7RHcl/Q++OQQCttCvM2kbNjPDIdFZLi6fM RGMKJ0VHGVuwANvQ9sW+s0hGIcogZbS9sSnRnVNnVDJUmxprjtvwrdsea3hdrHt8iM90 QMdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MnZOxUqx1ZT4Touh5z4fG1R1/mOzW4p4SPu43dGrv5M=; b=fEKtm9QYYHk+bYVOvyMLIGEdv1/gpzmN1OYQ+SkieABBzLn45W0dIaRLOkWm6DXKw5 C5B/FE5UB12GbHpEpjLU+Vdls1ir5dWC13MsIMTNOvx8FpnTOm6eznkX7kJT+sPvZf65 cESW2Gqm+4HWjrDFs6Zx9cFrEQSOvALGkTXkk+cQbw0Y+bknDp0X7NKsqeHKlcdHqhnV giV/ONWZ8syQV1cf0cUGEasa8bA7dW/DG00rJpBx12AfhOZ4xAwMNuOwxSFuveP2n+Fm NgGs7E5SwlFio6XWFj2q7xhUia0uoG0QmPebTi78WcZkoWGCFy4ItaD8VP8WIsON7i/n bvOQ== X-Gm-Message-State: AOAM5310/9y2TR2n2y1awDaLZ5YmBbZc6mqtw4M5rOT2AG27oRZax5XE GE3axKS39+xa0Si1sM0xPOYjhtKIiXg= X-Google-Smtp-Source: ABdhPJzZk1hnWOvgGRMLQUdjiUMyuGxWvDrCRHS4FYbFpya0Jmowg7J8HNooONA8ifMvRbxD4jtXdQ== X-Received: by 2002:a63:2e05:: with SMTP id u5mr20171771pgu.239.1610853077884; Sat, 16 Jan 2021 19:11:17 -0800 (PST) Received: from localhost ([2601:647:5800:2ac5:9eef:d5ff:fefc:64ae]) by smtp.gmail.com with ESMTPSA id 77sm11973126pfx.156.2021.01.16.19.11.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Jan 2021 19:11:17 -0800 (PST) From: Brian Norris To: openwrt-devel@lists.openwrt.org Subject: [PATCH] base-file: remove unused 'bootdisk' variable Date: Sat, 16 Jan 2021 19:11:12 -0800 Message-Id: <20210117031112.1334479-1-computersforpeace@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210116_221121_468201_E134BD3A X-CRM114-Status: UNSURE ( 9.68 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:533 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [computersforpeace[at]gmail.com] -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: , Cc: Brian Norris Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This was left obsolete in: 4a0688ed7153 base-files: remove block2mtd checks from sysupgrade Signed-off-by: Brian Norris --- package/base-files/files/lib/upgrade/common.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index c28bae48a15c..0c78974d7c6b 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -149,7 +149,7 @@ part_magic_fat() { } export_bootdevice() { - local cmdline bootdisk rootpart uuid blockdev uevent line class + local cmdline rootpart uuid blockdev uevent line class local MAJOR MINOR DEVNAME DEVTYPE if read cmdline < /proc/cmdline; then @@ -160,12 +160,6 @@ export_bootdevice() { ;; esac - case "$bootdisk" in - /dev/*) - uevent="/sys/class/block/${bootdisk##*/}/uevent" - ;; - esac - case "$rootpart" in PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9]) uuid="${rootpart#PARTUUID=}"