revert 2fdd374f4214129d93f10b7001adece9239752a2

[project/ubox.git] / mount_root.c

diff --git a/mount_root.c b/mount_root.c
index bc236fe..8868e40 100644 (file)
--- a/mount_root.c
+++ b/mount_root.c
@@ -109,12 +109,16 @@ static char* find_mount(char *mp)
        while (fgets(line, sizeof(line), fp)) {
                char *s, *t = strstr(line, " ");
 
-               if (!t)
+               if (!t) {
+                       fclose(fp);
                        return NULL;
+               }
                t++;
                s = strstr(t, " ");
-               if (!s)
+               if (!s) {
+                       fclose(fp);
                        return NULL;
+               }
                *s = '\0';
 
                if (!strcmp(t, mp)) {
@@ -143,13 +147,16 @@ static char* find_mount_point(char *block, char *fs)
                        char *p = &line[len + 1];
                        char *t = strstr(p, " ");
 
-                       if (!t)
+                       if (!t) {
+                               fclose(fp);
                                return NULL;
+                       }
 
                        *t = '\0';
                        t++;
 
                        if (fs && strncmp(t, fs, strlen(fs))) {
+                               fclose(fp);
                                ERROR("block is mounted with wrong fs\n");
                                return NULL;
                        }
@@ -423,6 +430,9 @@ static int switch2jffs(void)
 {
        char mtd[32];
 
+       if (!find_mtd_block("rootfs_patches", mtd, sizeof(mtd)))
+               return 0;
+
        if (find_mtd_block("rootfs_data", mtd, sizeof(mtd))) {
                ERROR("no rootfs_data was found\n");
                return -1;
@@ -579,7 +589,7 @@ static int main_jffs2reset(int argc, char **argv)
 
        mp = find_mount_point(mtd, "jffs2");
        if (mp) {
-               LOG("%s is mounted as %s, only ereasing files\n", mtd, mp);
+               LOG("%s is mounted as %s, only erasing files\n", mtd, mp);
                foreachdir(mp, handle_rmdir);
                mount(mp, "/", NULL, MS_REMOUNT, 0);
        } else {
@@ -677,50 +687,65 @@ static int main_switch2jffs(int argc, char **argv)
        return ret;
 }
 
-static int extroot(void)
+static int extroot(const char *prefix)
 {
+       char block_path[32];
+       char kmod_loader[64];
        struct stat s;
        pid_t pid;
 
-       if (stat("/sbin/block", &s))
+       sprintf(block_path, "%s/sbin/block", prefix);
+
+       if (stat(block_path, &s))
                return -1;
 
+       sprintf(kmod_loader, "/sbin/kmodloader %s/etc/modules-boot.d/ %s", prefix, prefix);
+       system(kmod_loader);
+
        pid = fork();
        if (!pid) {
                mkdir("/tmp/extroot", 0755);
-               execl("/sbin/block", "/sbin/block", "extroot", NULL);
+               execl(block_path, block_path, "extroot", NULL);
                exit(-1);
        } else if (pid > 0) {
                int status;
 
                waitpid(pid, &status, 0);
                if (!WEXITSTATUS(status)) {
-                       if (find_mount("/tmp/mnt")) {
+                       if (find_mount("/tmp/extroot/mnt")) {
                                mount("/dev/root", "/", NULL, MS_NOATIME | MS_REMOUNT | MS_RDONLY, 0);
 
-                               mkdir("/tmp/mnt/proc", 0755);
-                               mkdir("/tmp/mnt/dev", 0755);
-                               mkdir("/tmp/mnt/sys", 0755);
-                               mkdir("/tmp/mnt/tmp", 0755);
-                               mkdir("/tmp/mnt/rom", 0755);
+                               mkdir("/tmp/extroot/mnt/proc", 0755);
+                               mkdir("/tmp/extroot/mnt/dev", 0755);
+                               mkdir("/tmp/extroot/mnt/sys", 0755);
+                               mkdir("/tmp/extroot/mnt/tmp", 0755);
+                               mkdir("/tmp/extroot/mnt/rom", 0755);
 
-                               if (mount_move("/tmp", "", "/mnt")) {
+                               if (mount_move("/tmp/extroot", "", "/mnt")) {
                                        ERROR("moving pivotroot failed - continue normal boot\n");
-                                       umount("/tmp/mnt");
+                                       umount("/tmp/extroot/mnt");
                                } else if (pivot("/mnt", "/rom")) {
                                        ERROR("switching to pivotroot failed - continue normal boot\n");
                                        umount("/mnt");
                                } else {
+                                       umount("/tmp/overlay");
+                                       rmdir("/tmp/overlay");
+                                       rmdir("/tmp/extroot/mnt");
+                                       rmdir("/tmp/extroot");
                                        return 0;
                                }
-                       } else if (find_mount("/tmp/overlay")) {
-                               if (mount_move("/tmp", "", "/overlay")) {
+                       } else if (find_mount("/tmp/extroot/overlay")) {
+                               if (mount_move("/tmp/extroot", "", "/overlay")) {
                                        ERROR("moving extroot failed - continue normal boot\n");
-                                       umount("/tmp/overlay");
+                                       umount("/tmp/extroot/overlay");
                                } else if (fopivot("/overlay", "/rom")) {
                                        ERROR("switching to extroot failed - continue normal boot\n");
                                        umount("/overlay");
                                } else {
+                                       umount("/tmp/overlay");
+                                       rmdir("/tmp/overlay");
+                                       rmdir("/tmp/extroot/overlay");
+                                       rmdir("/tmp/extroot");
                                        return 0;
                                }
                        }
@@ -748,13 +773,15 @@ int main(int argc, char **argv)
        if (!getenv("PREINIT"))
                return -1;
 
-       if (find_mtd_char("rootfs_data", mtd, sizeof(mtd))) {
+       if (!find_mtd_block("rootfs_patches", mtd, sizeof(mtd))) {
+               ramoverlay();
+       } else if (find_mtd_char("rootfs_data", mtd, sizeof(mtd))) {
                if (!find_mtd_char("rootfs", mtd, sizeof(mtd)))
                        mtd_unlock(mtd);
                LOG("mounting /dev/root\n");
                mount("/dev/root", "/", NULL, MS_NOATIME | MS_REMOUNT, 0);
        } else {
-               if (!extroot()) {
+               if (!extroot("")) {
                        fprintf(stderr, "mount_root: switched to extroot\n");
                        return 0;
                }
@@ -773,6 +800,12 @@ int main(int argc, char **argv)
                        }
 
                        mtd_mount_jffs2();
+
+                       if (!extroot("/tmp/overlay")) {
+                               fprintf(stderr, "mount_root: switched to extroot\n");
+                               return 0;
+                       }
+
                        DEBUG(1, "switching to jffs2\n");
                        if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
                                ERROR("switching to jffs2 failed - fallback to ramoverlay\n");