[PATCH] base-file: remove unused 'bootdisk' variable

Brian Norris computersforpeace at gmail.com
Sat Jan 16 22:11:12 EST 2021


This was left obsolete in:
4a0688ed7153 base-files: remove block2mtd checks from sysupgrade

Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 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=}"
-- 
2.29.2




More information about the openwrt-devel mailing list