*/
#include <sys/mount.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
{
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) {
mount("/dev/root", "/", NULL, MS_NOATIME | MS_REMOUNT, 0);
}
- /*
- * Before trying to mount and use "rootfs_data" let's check if there is
- * extroot configured. Following call will handle reading config from
- * the "rootfs_data" on its own.
- */
- extroot_prefix = "";
- if (!mount_extroot()) {
+ /* Check for extroot config in rootfs before even trying rootfs_data */
+ if (!mount_extroot("")) {
ULOG_NOTE("switched to extroot\n");
return 0;
}
/* There isn't extroot, so just try to mount "rootfs_data" */
+ volume_init(data);
switch (volume_identify(data)) {
case FS_NONE:
ULOG_WARN("no usable overlay filesystem found, using tmpfs overlay\n");
ULOG_NOTE("jffs2 not ready yet, using temporary tmpfs overlay\n");
return ramoverlay();
+ case FS_EXT4:
+ case FS_F2FS:
case FS_JFFS2:
case FS_UBIFS:
mount_overlay(data);
case FS_NONE:
case FS_DEADCODE:
return jffs2_switch(v);
+
+ case FS_EXT4:
+ case FS_F2FS:
+ case FS_JFFS2:
+ case FS_UBIFS:
+ fs_state_set("/overlay", FS_STATE_READY);
+ break;
}
return 0;
{
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"))