fstools: support for ext4fs overlay

[project/fstools.git] / libfstools / overlay.c

diff --git a/libfstools/overlay.c b/libfstools/overlay.c
index d6c311b..f8088f9 100644 (file)
--- a/libfstools/overlay.c
+++ b/libfstools/overlay.c
@@ -78,10 +78,16 @@ foreachdir(const char *dir, int (*cb)(const char*))
                snprintf(globdir, 256, "%s/*", dir); /**/
 
        if (!glob(globdir, GLOB_NOESCAPE | GLOB_MARK | GLOB_ONLYDIR, NULL, &gl))
-               for (j = 0; j < gl.gl_pathc; j++)
-                       if (!stat(gl.gl_pathv[j], &s) && !S_ISLNK(s.st_mode))
-                               foreachdir(gl.gl_pathv[j], cb);
+               for (j = 0; j < gl.gl_pathc; j++) {
+                       char *dir = gl.gl_pathv[j];
+                       int len = strlen(gl.gl_pathv[j]);
+
+                       if (len > 1 && dir[len - 1] == '/')
+                               dir[len - 1] = '\0';
 
+                       if (!lstat(gl.gl_pathv[j], &s) && !S_ISLNK(s.st_mode))
+                               foreachdir(gl.gl_pathv[j], cb);
+       }
        cb(dir);
 }
 
@@ -239,6 +245,16 @@ jffs2_switch(struct volume *v)
                        ret = -1;
                }
                break;
+
+       case FS_EXT4FS:
+               ret = overlay_mount(v, "ext4");
+               if (ret)
+                       break;
+               if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
+                       ULOG_ERR("switching to ext4fs failed\n");
+                       ret = -1;
+               }
+               break;
        }
 
        if (ret)
@@ -264,6 +280,10 @@ static int overlay_mount_fs(struct volume *v)
        case FS_UBIFS:
                fstype = "ubifs";
                break;
+
+       case FS_EXT4FS:
+               fstype = "ext4";
+               break;
        }
 
        volume_init(v);
@@ -305,6 +325,9 @@ int fs_state_set(const char *dir, enum fs_state state)
        char valstr[16];
        char *path;
 
+       if (fs_state_get(dir) == state)
+               return 0;
+
        path = alloca(strlen(dir) + 1 + sizeof("/.fs_state"));
        sprintf(path, "%s/.fs_state", dir);
        unlink(path);