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 87fad1144397d99b735aa1418365c6aaeda1a8cf..352f0f23aff7f2c08f29873db24fe9b555e63e2b 100644 (file)
--- 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 dffb0a6c48ee9d9581baba626359005c956f874d..ca2c31c3a9ed70fb22d90b5af92d59a9f406c392 100644 (file)
--- 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");