From c8b51499261146cae10270ca2dd7dcc637a2d509 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 17 Feb 2015 20:19:59 +0100 Subject: [PATCH] block: extroot: remove unneeded rootfs tests The code testing for a "rootfs" MTD partition serves no actual purpose and the test results are not used either. On top of that it prevents working extroot on non-MTD systems, so drop the code. Signed-off-by: Jo-Philipp Wich --- block.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/block.c b/block.c index de8a3b7..a44241d 100644 --- a/block.c +++ b/block.c @@ -1016,7 +1016,6 @@ static int mount_extroot(char *cfg) static int main_extroot(int argc, char **argv) { struct blkid_struct_probe *pr; - char fs[32] = { 0 }; char blkdev_path[32] = { 0 }; int err = -1; #ifdef UBIFS_EXTROOT @@ -1035,32 +1034,6 @@ static int main_extroot(int argc, char **argv) cache_load(1); /* - * Make sure there is "rootfs" MTD partition or UBI volume. - * TODO: What for? - */ - find_block_mtd("rootfs", fs, sizeof(fs)); - if (!fs[0]) { -#ifdef UBIFS_EXTROOT - libubi = libubi_open(); - find_block_ubi_RO(libubi, "rootfs", fs, sizeof(fs)); - libubi_close(libubi); - if (!fs[0]) { - ERROR("extroot: unable to locate rootfs mtdblock / ubiblock\n"); - return -2; - } -#else - ERROR("extroot: unable to locate rootfs mtdblock\n"); - return -2; -#endif - } - - pr = find_block_info(NULL, NULL, fs); - if (!pr) { - ERROR("extroot: unable to retrieve rootfs information\n"); - return -3; - } - - /* * Look for "rootfs_data". We will want to mount it and check for * extroot configuration. */ -- 2.11.0