X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffstools.git;a=blobdiff_plain;f=libfstools%2Foverlay.c;h=5215ff3a06018db740ca6a604f6d36e78d5f59eb;hp=bb506ee33c60e14ce12b563cf569b6007b938e45;hb=4abf9de460253771fabef2b2cdf5d7a8b457bd1d;hpb=08315ab8b728ce4adba62e11ada879b301318dd8 diff --git a/libfstools/overlay.c b/libfstools/overlay.c index bb506ee..5215ff3 100644 --- a/libfstools/overlay.c +++ b/libfstools/overlay.c @@ -32,9 +32,42 @@ #define SWITCH_JFFS2 "/tmp/.switch_jffs2" +static bool keep_sysupgrade; + +static int +handle_rmdir(const char *dir) +{ + struct dirent *dt; + struct stat st; + DIR *d; + int fd; + + d = opendir(dir); + if (!d) + return -1; + + fd = dirfd(d); + + while ((dt = readdir(d)) != NULL) { + if (fstatat(fd, dt->d_name, &st, AT_SYMLINK_NOFOLLOW) || S_ISDIR(st.st_mode)) + continue; + + if (keep_sysupgrade && !strcmp(dt->d_name, "sysupgrade.tgz")) + continue; + + unlinkat(fd, dt->d_name, 0); + } + + closedir(d); + rmdir(dir); + + return 0; +} + void foreachdir(const char *dir, int (*cb)(const char*)) { + struct stat s = { 0 }; char globdir[256]; glob_t gl; int j; @@ -45,12 +78,26 @@ 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++) - 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); } +void +overlay_delete(const char *dir, bool _keep_sysupgrade) +{ + keep_sysupgrade = _keep_sysupgrade; + foreachdir(dir, handle_rmdir); +} + static int overlay_mount(struct volume *v, char *fs) { @@ -64,7 +111,7 @@ overlay_mount(struct volume *v, char *fs) return -1; } - return volume_init(v); + return 0; } static int @@ -91,7 +138,10 @@ switch2jffs(struct volume *v) 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)); @@ -142,91 +192,129 @@ handle_whiteout(const char *dir) return 0; } +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 ret = -1; + int type; if (find_overlay_mount("overlayfs:/tmp/root")) return -1; if (find_filesystem("overlay")) { ULOG_ERR("overlayfs not supported by kernel\n"); - return ret; + return -1; } + volume_init(v); mp = find_mount_point(v->blk, 0); if (mp) { ULOG_ERR("rootfs_data:%s is already mounted as %s\n", v->blk, mp); return -1; } - 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: - 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); break; + case FS_F2FS: case FS_UBIFS: - 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")) { - ULOG_ERR("switching to ubifs failed\n"); - ret = -1; + ULOG_ERR("switching to jffs2 failed\n"); + return -1; } break; } - return ret; + + sync(); + fs_state_set("/overlay", FS_STATE_READY); + return 0; } static int overlay_mount_fs(struct volume *v) { - char *fstype; + 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; } - 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)); return -1; } - volume_init(v); + return 0; +} - 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; @@ -248,7 +336,22 @@ int mount_overlay(struct volume *v) return 0; } - ULOG_INFO("switching to overlay\n"); + 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"); return ramoverlay();