X-Git-Url: http://git.openwrt.org//?a=blobdiff_plain;f=libfstools%2Foverlay.c;h=f68065e4fb7e598f0c9e49296add7966be39be2e;hb=9668e2ef2855ab95d8f2b2868d72c8ca5d742047;hp=9e830a154b536a77bd6f8f52182fc3debfd8b8b8;hpb=ba01996534d15dc725a2dcc56a59fbfb24b58787;p=project%2Ffstools.git

diff --git a/libfstools/overlay.c b/libfstools/overlay.c
index 9e830a1..f68065e 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;
@@ -42,29 +75,43 @@ foreachdir(const char *dir, int (*cb)(const char*))
 	if (dir[strlen(dir) - 1] == '/')
 		snprintf(globdir, 256, "%s*", dir);
 	else
-		snprintf(globdir, 256, "%s/*", dir);
+		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)
 {
 	if (mkdir("/tmp/overlay", 0755)) {
-		fprintf(stderr, "failed to mkdir /tmp/overlay: %s\n", strerror(errno));
+		ULOG_ERR("failed to mkdir /tmp/overlay: %s\n", strerror(errno));
 		return -1;
 	}
 
 	if (mount(v->blk, "/tmp/overlay", fs, MS_NOATIME, NULL)) {
-		fprintf(stderr, "failed to mount -t %s %s /tmp/overlay: %s\n", fs, v->blk, strerror(errno));
+		ULOG_ERR("failed to mount -t %s %s /tmp/overlay: %s\n", fs, v->blk, strerror(errno));
 		return -1;
 	}
 
-	return volume_init(v);
+	return 0;
 }
 
 static int
@@ -74,7 +121,7 @@ switch2jffs(struct volume *v)
 	int ret;
 
 	if (!stat(SWITCH_JFFS2, &s)) {
-		fprintf(stderr, "jffs2 switch already running\n");
+		ULOG_ERR("jffs2 switch already running\n");
 		return -1;
 	}
 
@@ -82,24 +129,27 @@ switch2jffs(struct volume *v)
 	ret = mount(v->blk, "/rom/overlay", "jffs2", MS_NOATIME, NULL);
 	unlink("/tmp/.switch_jffs2");
 	if (ret) {
-		fprintf(stderr, "failed - mount -t jffs2 %s /rom/overlay: %s\n", v->blk, strerror(errno));
+		ULOG_ERR("failed - mount -t jffs2 %s /rom/overlay: %s\n", v->blk, strerror(errno));
 		return -1;
 	}
 
 	if (mount("none", "/", NULL, MS_NOATIME | MS_REMOUNT, 0)) {
-		fprintf(stderr, "failed - mount -o remount,ro none: %s\n", strerror(errno));
+		ULOG_ERR("failed - mount -o remount,ro none: %s\n", strerror(errno));
 		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")) {
-		fprintf(stderr, "failed - pivot /rom /mnt: %s\n", strerror(errno));
+		ULOG_ERR("failed - pivot /rom /mnt: %s\n", strerror(errno));
 		return -1;
 	}
 
 	if (mount_move("/mnt", "/tmp/root", "")) {
-		fprintf(stderr, "failed - mount -o move /mnt /tmp/root %s\n", strerror(errno));
+		ULOG_ERR("failed - mount -o move /mnt /tmp/root %s\n", strerror(errno));
 		return -1;
 	}
 
@@ -152,25 +202,26 @@ jffs2_switch(struct volume *v)
 		return -1;
 
 	if (find_filesystem("overlay")) {
-		fprintf(stderr, "overlayfs not found\n");
+		ULOG_ERR("overlayfs not supported by kernel\n");
 		return ret;
 	}
 
+	volume_init(v);
 	mp = find_mount_point(v->blk, 0);
 	if (mp) {
-		fprintf(stderr, "rootfs_data:%s is already mounted as %s\n", v->blk, mp);
+		ULOG_ERR("rootfs_data:%s is already mounted as %s\n", v->blk, mp);
 		return -1;
 	}
 
 	switch (volume_identify(v)) {
 	case FS_NONE:
-		fprintf(stderr, "no jffs2 marker found\n");
+		ULOG_ERR("no jffs2 marker found\n");
 		/* fall through */
 
 	case FS_DEADCODE:
 		ret = switch2jffs(v);
 		if (!ret) {
-			fprintf(stderr, "doing fo cleanup\n");
+			ULOG_INFO("performing overlay whiteout\n");
 			umount2("/tmp/root", MNT_DETACH);
 			foreachdir("/overlay/", handle_whiteout);
 		}
@@ -181,7 +232,7 @@ jffs2_switch(struct volume *v)
 		if (ret)
 			break;
 		if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
-			fprintf(stderr, "switching to jffs2 failed\n");
+			ULOG_ERR("switching to jffs2 failed\n");
 			ret = -1;
 		}
 		break;
@@ -191,12 +242,18 @@ jffs2_switch(struct volume *v)
 		if (ret)
 			break;
 		if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
-			fprintf(stderr, "switching to ubifs failed\n");
+			ULOG_ERR("switching to ubifs 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)
@@ -204,7 +261,7 @@ static int overlay_mount_fs(struct volume *v)
 	char *fstype;
 
 	if (mkdir("/tmp/overlay", 0755)) {
-		fprintf(stderr, "failed to mkdir /tmp/overlay: %s\n", strerror(errno));
+		ULOG_ERR("failed to mkdir /tmp/overlay: %s\n", strerror(errno));
 		return -1;
 	}
 
@@ -217,16 +274,54 @@ static int overlay_mount_fs(struct volume *v)
 	}
 
 	if (mount(v->blk, "/tmp/overlay", fstype, MS_NOATIME, NULL)) {
-		fprintf(stderr, "failed to mount -t %s %s /tmp/overlay: %s\n",
-				fstype, v->blk, strerror(errno));
+		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;
@@ -236,7 +331,7 @@ int mount_overlay(struct volume *v)
 
 	mp = find_mount_point(v->blk, 0);
 	if (mp) {
-		fprintf(stderr, "rootfs_data:%s is already mounted as %s\n", v->blk, mp);
+		ULOG_ERR("rootfs_data:%s is already mounted as %s\n", v->blk, mp);
 		return -1;
 	}
 
@@ -244,13 +339,28 @@ int mount_overlay(struct volume *v)
 
 	extroot_prefix = "/tmp/overlay";
 	if (!mount_extroot()) {
-		fprintf(stderr, "switched to extroot\n");
+		ULOG_INFO("switched to extroot\n");
 		return 0;
 	}
 
-	fprintf(stderr, "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")) {
-		fprintf(stderr, "switching to jffs2 failed - fallback to ramoverlay\n");
+		ULOG_ERR("switching to jffs2 failed - fallback to ramoverlay\n");
 		return ramoverlay();
 	}