X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=mount_root.c;h=aaafecad506407544710f0ff70e81e312015f628;hb=4abf9de460253771fabef2b2cdf5d7a8b457bd1d;hp=a8505fabb9aa5de4a32af26936e736e84292cb05;hpb=35056038c02a7cbd18b57a5f46a373d564c69693;p=project%2Ffstools.git

diff --git a/mount_root.c b/mount_root.c
index a8505fa..aaafeca 100644
--- a/mount_root.c
+++ b/mount_root.c
@@ -12,9 +12,14 @@
  */
 
 #include <sys/mount.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <libubox/ulog.h>
+
 #include "libfstools/libfstools.h"
 #include "libfstools/volume.h"
 
@@ -25,17 +30,18 @@
 static int
 start(int argc, char *argv[1])
 {
-	struct volume *v = volume_find("rootfs_data");
+	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 (!v) {
-		v = volume_find("rootfs");
-		volume_init(v);
-		fprintf(stderr, "mounting /dev/root\n");
+	if (!data) {
+		root = volume_find("rootfs");
+		volume_init(root);
+		ULOG_NOTE("mounting /dev/root\n");
 		mount("/dev/root", "/", NULL, MS_NOATIME | MS_REMOUNT, 0);
-		return 0;
 	}
 
 	/*
@@ -45,28 +51,34 @@ start(int argc, char *argv[1])
 	 */
 	extroot_prefix = "";
 	if (!mount_extroot()) {
-		fprintf(stderr, "fs-state: switched to extroot\n");
+		ULOG_NOTE("switched to extroot\n");
 		return 0;
 	}
 
 	/* There isn't extroot, so just try to mount "rootfs_data" */
-	switch (volume_identify(v)) {
+	volume_init(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_F2FS:
 	case FS_JFFS2:
 	case FS_UBIFS:
-		mount_overlay(v);
+		mount_overlay(data);
 		break;
 
 	case FS_SNAPSHOT:
-		mount_snapshot(v);
+		mount_snapshot(data);
 		break;
 	}
 
@@ -97,6 +109,12 @@ done(int argc, char *argv[1])
 	case FS_NONE:
 	case FS_DEADCODE:
 		return jffs2_switch(v);
+
+	case FS_F2FS:
+	case FS_JFFS2:
+	case FS_UBIFS:
+		fs_state_set("/overlay", FS_STATE_READY);
+		break;
 	}
 
 	return 0;
@@ -106,6 +124,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"))