Revert "mount_root: code failed in failsafe"

This reverts commit 09f8e0097fe1370700658542e7bda831c31de4bf.

diff --git a/mount_root.c b/mount_root.c
index d1b69814fcf0c9e569b4a1ea7fbdfe530f68bd2e..bf70265d45cc49568562e58ecfe6bd6cf41929be 100644 (file)
--- a/mount_root.c
+++ b/mount_root.c
@@ -27,16 +27,14 @@
 static int
 start(int argc, char *argv[1])
 {
-       struct volume *root = volume_find("rootfs");
+       struct volume *root;
        struct volume *data = volume_find("rootfs_data");
 
-       if (data && find_mount_point(data->blk, 0))
-               return -1;
-
-       if (root && find_mount_point(root->blk, 0))
+       if (!getenv("PREINIT"))
                return -1;
 
        if (!data) {
+               root = volume_find("rootfs");
                volume_init(root);
                ULOG_NOTE("mounting /dev/root\n");
                mount("/dev/root", "/", NULL, MS_NOATIME | MS_REMOUNT, 0);