[openwrt/openwrt] base-files: remove block2mtd checks from sysupgrade

LEDE Commits lede-commits at lists.infradead.org
Sat Oct 17 10:46:11 EDT 2020


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/4a0688ed71532a3dd68907f5603177d970e4ec03

commit 4a0688ed71532a3dd68907f5603177d970e4ec03
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Sat Oct 17 11:15:32 2020 +0200

    base-files: remove block2mtd checks from sysupgrade
    
    This hasn't been used in a long time
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 package/base-files/files/lib/upgrade/common.sh         | 4 ----
 target/linux/octeon/base-files/lib/upgrade/platform.sh | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index c375b70742..2eb26ba44b 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -126,10 +126,6 @@ export_bootdevice() {
 
 	if read cmdline < /proc/cmdline; then
 		case "$cmdline" in
-			*block2mtd=*)
-				bootdisk="${cmdline##*block2mtd=}"
-				bootdisk="${bootdisk%%,*}"
-			;;
 			*root=*)
 				rootpart="${cmdline##*root=}"
 				rootpart="${rootpart%% *}"
diff --git a/target/linux/octeon/base-files/lib/upgrade/platform.sh b/target/linux/octeon/base-files/lib/upgrade/platform.sh
index d938950906..33a9931263 100755
--- a/target/linux/octeon/base-files/lib/upgrade/platform.sh
+++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh
@@ -7,10 +7,6 @@ platform_get_rootfs() {
 
 	if read cmdline < /proc/cmdline; then
 		case "$cmdline" in
-			*block2mtd=*)
-				rootfsdev="${cmdline##*block2mtd=}"
-				rootfsdev="${rootfsdev%%,*}"
-			;;
 			*root=*)
 				rootfsdev="${cmdline##*root=}"
 				rootfsdev="${rootfsdev%% *}"



More information about the lede-commits mailing list