From: Daniel Golle <daniel@makrotopia.org>
Date: Wed, 21 Feb 2024 00:10:53 +0000 (+0000)
Subject: system: break infite loop resolving rootfs type
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1901aba90b6841ec1a99a25224a92d2519c603fd;p=project%2Fprocd.git

system: break infite loop resolving rootfs type

When running procd outside of OpenWrt, e.g. for debugging or research
situations inside a container environment, an inifite loop can occur
when trying to determine the rootfs type. Make sure that doesn't
happen.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/system.c b/system.c
index 1f2be33..8df606f 100644
--- a/system.c
+++ b/system.c
@@ -94,8 +94,12 @@ static const char *system_rootfs_type(void) {
 			 * lowerdir, as that can point to "/" being a previous
 			 * overlay mount (after firstboot or sysuprade config
 			 * restore). Hence just assume the lowerdir is "/rom" and
-			 * restart searching for that instead.
+			 * restart searching for that instead if that's not
+			 * already the case.
 			 */
+			if (!strcmp(mp, "/rom"))
+				break;
+
 			mp = "/rom";
 			fseek(mounts, 0, SEEK_SET);
 			continue;