Signed-off-by: Felix Fietkau <nbd@nbd.name>
-find_mount_point(char *block, int mtd_only)
+find_mount_point(char *block, int root_only)
{
FILE *fp = fopen("/proc/mounts", "r");
static char line[256];
{
FILE *fp = fopen("/proc/mounts", "r");
static char line[256];
+ if (root_only &&
+ strncmp(t, "f2fs", 4) &&
strncmp(t, "jffs2", 5) &&
strncmp(t, "ubifs", 5)) {
fclose(fp);
strncmp(t, "jffs2", 5) &&
strncmp(t, "ubifs", 5)) {
fclose(fp);
FS_JFFS2,
FS_DEADCODE,
FS_UBIFS,
FS_JFFS2,
FS_DEADCODE,
FS_UBIFS,
extern int find_overlay_mount(char *overlay);
extern char* find_mount(char *mp);
extern int find_overlay_mount(char *overlay);
extern char* find_mount(char *mp);
-extern char* find_mount_point(char *block, int mtd_only);
+extern char* find_mount_point(char *block, int root_only);
extern int find_filesystem(char *fs);
extern int jffs2_switch(struct volume *v);
extern int find_filesystem(char *fs);
extern int jffs2_switch(struct volume *v);
+static char *overlay_fs_name(int type)
+{
+ switch (type) {
+ case FS_F2FS:
+ return "f2fs";
+ case FS_UBIFS:
+ return "ubifs";
+ case FS_JFFS2:
+ default:
+ return "jffs2";
+ }
+}
+
int
jffs2_switch(struct volume *v)
{
char *mp;
int
jffs2_switch(struct volume *v)
{
char *mp;
if (find_overlay_mount("overlayfs:/tmp/root"))
return -1;
if (find_filesystem("overlay")) {
ULOG_ERR("overlayfs not supported by kernel\n");
if (find_overlay_mount("overlayfs:/tmp/root"))
return -1;
if (find_filesystem("overlay")) {
ULOG_ERR("overlayfs not supported by kernel\n");
- switch (volume_identify(v)) {
+ type = volume_identify(v);
+ switch (type) {
case FS_NONE:
ULOG_ERR("no jffs2 marker found\n");
/* fall through */
case FS_DEADCODE:
case FS_NONE:
ULOG_ERR("no jffs2 marker found\n");
/* fall through */
case FS_DEADCODE:
- ret = switch2jffs(v);
- if (!ret) {
- ULOG_INFO("performing overlay whiteout\n");
- umount2("/tmp/root", MNT_DETACH);
- foreachdir("/overlay/", handle_whiteout);
- }
- break;
+ if (switch2jffs(v))
+ return -1;
- case FS_JFFS2:
- ret = overlay_mount(v, "jffs2");
- if (ret)
- break;
- if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
- ULOG_ERR("switching to jffs2 failed\n");
- ret = -1;
- }
+ ULOG_INFO("performing overlay whiteout\n");
+ umount2("/tmp/root", MNT_DETACH);
+ foreachdir("/overlay/", handle_whiteout);
- ret = overlay_mount(v, "ubifs");
- if (ret)
- break;
+ if (overlay_mount(v, overlay_fs_name(type)))
+ return -1;
if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
- ULOG_ERR("switching to ubifs failed\n");
- ret = -1;
+ ULOG_ERR("switching to jffs2 failed\n");
+ return -1;
- if (ret)
- return ret;
-
sync();
fs_state_set("/overlay", FS_STATE_READY);
return 0;
sync();
fs_state_set("/overlay", FS_STATE_READY);
return 0;
static int overlay_mount_fs(struct volume *v)
{
static int overlay_mount_fs(struct volume *v)
{
+ char *fstype = overlay_fs_name(volume_identify(v));
if (mkdir("/tmp/overlay", 0755)) {
ULOG_ERR("failed to mkdir /tmp/overlay: %s\n", strerror(errno));
return -1;
}
if (mkdir("/tmp/overlay", 0755)) {
ULOG_ERR("failed to mkdir /tmp/overlay: %s\n", strerror(errno));
return -1;
}
- fstype = "jffs2";
-
- switch (volume_identify(v)) {
- case FS_UBIFS:
- fstype = "ubifs";
- break;
- }
-
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));
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));
ULOG_NOTE("jffs2 not ready yet, using temporary tmpfs overlay\n");
return ramoverlay();
ULOG_NOTE("jffs2 not ready yet, using temporary tmpfs overlay\n");
return ramoverlay();
case FS_JFFS2:
case FS_UBIFS:
mount_overlay(data);
case FS_JFFS2:
case FS_UBIFS:
mount_overlay(data);
case FS_DEADCODE:
return jffs2_switch(v);
case FS_DEADCODE:
return jffs2_switch(v);
case FS_JFFS2:
case FS_UBIFS:
fs_state_set("/overlay", FS_STATE_READY);
case FS_JFFS2:
case FS_UBIFS:
fs_state_set("/overlay", FS_STATE_READY);