From: Rafał Miłecki <rafal@milecki.pl>
Date: Tue, 4 Jan 2022 14:27:14 +0000 (+0100)
Subject: Update / fix extroot comments
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=128ecaf8da9887b3a1fe35ed95d352a9b64b6342;p=project%2Ffstools.git

Update / fix extroot comments

Comment in start() was invalid as mount_extroot() doesn't handle any
mounting internally. It was a misunderstanding coming from block.c
function called just the same.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/libfstools/overlay.c b/libfstools/overlay.c
index 87fad11..352f0f2 100644
--- a/libfstools/overlay.c
+++ b/libfstools/overlay.c
@@ -431,6 +431,10 @@ int mount_overlay(struct volume *v)
 	if (err)
 		return err;
 
+	/*
+	 * Check for extroot config in overlay (rootfs_data) and if present then
+	 * prefer it over rootfs_data.
+	 */
 	extroot_prefix = "/tmp/overlay";
 	if (!mount_extroot()) {
 		ULOG_INFO("switched to extroot\n");
diff --git a/mount_root.c b/mount_root.c
index dffb0a6..ca2c31c 100644
--- a/mount_root.c
+++ b/mount_root.c
@@ -44,11 +44,7 @@ start(int argc, char *argv[1])
 		mount("/dev/root", "/", NULL, MS_NOATIME | MS_REMOUNT, 0);
 	}
 
-	/*
-	 * Before trying to mount and use "rootfs_data" let's check if there is
-	 * extroot configured. Following call will handle reading config from
-	 * the "rootfs_data" on its own.
-	 */
+	/* Check for extroot config in rootfs before even trying rootfs_data */
 	extroot_prefix = "";
 	if (!mount_extroot()) {
 		ULOG_NOTE("switched to extroot\n");