void
foreachdir(const char *dir, int (*cb)(const char*))
{
+ struct stat s = { 0 };
char globdir[256];
glob_t gl;
int j;
snprintf(globdir, 256, "%s/*", dir); /**/
if (!glob(globdir, GLOB_NOESCAPE | GLOB_MARK | GLOB_ONLYDIR, NULL, &gl))
- for (j = 0; j < gl.gl_pathc; j++)
- 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);
}
return -1;
}
- system("cp -a /tmp/root/* /rom/overlay"); /**/
+ if (system("cp -a /tmp/root/* /rom/overlay")) {
+ ULOG_ERR("failed - cp -a /tmp/root/* /rom/overlay: %s\n", strerror(errno));
+ return -1;
+ }
if (pivot("/rom", "/mnt")) {
ULOG_ERR("failed - pivot /rom /mnt: %s\n", strerror(errno));
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;
}
- return ret;
+
+ if (ret)
+ return ret;
+
+ sync();
+ fs_state_set("/overlay", FS_STATE_READY);
+ return 0;
}
static int overlay_mount_fs(struct volume *v)
case FS_UBIFS:
fstype = "ubifs";
break;
+
+ case FS_EXT4FS:
+ fstype = "ext4";
+ break;
}
+ volume_init(v);
+
if (mount(v->blk, "/tmp/overlay", fstype, MS_NOATIME, NULL)) {
ULOG_ERR("failed to mount -t %s %s /tmp/overlay: %s\n",
fstype, v->blk, strerror(errno));
return -1;
}
- volume_init(v);
-
return -1;
}
+enum fs_state fs_state_get(const char *dir)
+{
+ char *path;
+ char valstr[16];
+ uint32_t val;
+ ssize_t len;
+
+ path = alloca(strlen(dir) + 1 + sizeof("/.fs_state"));
+ sprintf(path, "%s/.fs_state", dir);
+ len = readlink(path, valstr, sizeof(valstr) - 1);
+ if (len < 0)
+ return FS_STATE_UNKNOWN;
+
+ valstr[len] = 0;
+ val = atoi(valstr);
+
+ if (val > __FS_STATE_LAST)
+ return FS_STATE_UNKNOWN;
+
+ return val;
+}
+
+
+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);
+ snprintf(valstr, sizeof(valstr), "%d", state);
+
+ return symlink(valstr, path);
+}
+
+
int mount_overlay(struct volume *v)
{
char *mp;
return 0;
}
+ switch(fs_state_get("/tmp/overlay")) {
+ case FS_STATE_UNKNOWN:
+ fs_state_set("/tmp/overlay", FS_STATE_PENDING);
+ if (fs_state_get("/tmp/overlay") != FS_STATE_PENDING) {
+ ULOG_ERR("unable to set filesystem state\n");
+ break;
+ }
+ case FS_STATE_PENDING:
+ ULOG_INFO("overlay filesystem has not been fully initialized yet\n");
+ overlay_delete("/tmp/overlay", true);
+ break;
+ case FS_STATE_READY:
+ break;
+ }
+
ULOG_INFO("switching to jffs2 overlay\n");
if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
ULOG_ERR("switching to jffs2 failed - fallback to ramoverlay\n");