X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffstools.git;a=blobdiff_plain;f=mount_root.c;h=6e06b45806e5e05ae660f7692a6a1585bd220ef4;hp=3c38a297b3e9b2d43f52eeaeb5763c284aae249a;hb=7a967198b9b18d00526094a43248b1c0892eb4aa;hpb=fa23aef606c0a7b87552c7f6643d4fcbe9c2eee4

diff --git a/mount_root.c b/mount_root.c
index 3c38a29..6e06b45 100644
--- a/mount_root.c
+++ b/mount_root.c
@@ -12,6 +12,9 @@
  */
 
 #include <sys/mount.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -29,8 +32,9 @@ start(int argc, char *argv[1])
 {
 	struct volume *root;
 	struct volume *data = volume_find("rootfs_data");
+	struct stat s;
 
-	if (!getenv("PREINIT"))
+	if (!getenv("PREINIT") && stat("/tmp/.preinit", &s))
 		return -1;
 
 	if (!data) {
@@ -54,12 +58,16 @@ start(int argc, char *argv[1])
 	/* There isn't extroot, so just try to mount "rootfs_data" */
 	switch (volume_identify(data)) {
 	case FS_NONE:
+		ULOG_WARN("no usable overlay filesystem found, using tmpfs overlay\n");
+		return ramoverlay();
+
 	case FS_DEADCODE:
 		/*
 		 * Filesystem isn't ready yet and we are in the preinit, so we
 		 * can't afford waiting for it. Use tmpfs for now and handle it
 		 * properly in the "done" call.
 		 */
+		ULOG_NOTE("jffs2 not ready yet, using temporary tmpfs overlay\n");
 		return ramoverlay();
 
 	case FS_JFFS2:
@@ -99,6 +107,11 @@ done(int argc, char *argv[1])
 	case FS_NONE:
 	case FS_DEADCODE:
 		return jffs2_switch(v);
+
+	case FS_JFFS2:
+	case FS_UBIFS:
+		fs_state_set("/overlay", FS_STATE_READY);
+		break;
 	}
 
 	return 0;
@@ -108,6 +121,8 @@ int main(int argc, char **argv)
 {
 	if (argc < 2)
 		return start(argc, argv);
+	if (!strcmp(argv[1], "ram"))
+		return ramoverlay();
 	if (!strcmp(argv[1], "stop"))
 		return stop(argc, argv);
 	if (!strcmp(argv[1], "done"))