From: Daniel Golle <daniel@makrotopia.org>
Date: Tue, 3 Jan 2023 12:07:15 +0000 (+0100)
Subject: block: consider currently mounted root device first
X-Git-Url: http://git.openwrt.org/source?a=commitdiff_plain;h=56a9b4e7e39514813208b776605899c80a37a7f3;p=project%2Ffstools.git

block: consider currently mounted root device first

First look for the currently mounted root device and then fallback to
looking for rootfs.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
---

diff --git a/block.c b/block.c
index 7b2ea8f..c015fe1 100644
--- a/block.c
+++ b/block.c
@@ -1479,7 +1479,9 @@ static int check_extroot(char *path)
 	FILE *fp;
 	int err;
 
-	err = find_block_mtd("\"rootfs\"", devpath, sizeof(devpath));
+	err = find_root_dev(devpath, sizeof(devpath));
+	if (err)
+		err = find_block_mtd("\"rootfs\"", devpath, sizeof(devpath));
 #ifdef UBIFS_EXTROOT
 	if (err) {
 		libubi_t libubi;
@@ -1489,9 +1491,6 @@ static int check_extroot(char *path)
 		libubi_close(libubi);
 	}
 #endif
-	if (err) {
-		err = find_root_dev(devpath, sizeof(devpath));
-	}
 	if (err) {
 		ULOG_ERR("extroot: unable to determine root device\n");
 		return -1;