mount_root: code failed in failsafe

the code checks if we are in PREINIT before mounting root.
change this to check if root is actually mounted.
this is a regression caused by ssh login during failsafe.

Signed-off-by: John Crispin <john@phrozen.org>

diff --git a/mount_root.c b/mount_root.c
index 47a3409dfcd48361dd77dfd40a41b5068b4bb08d..77d683ba30bc028fd4c22c971181ecc6988226da 100644 (file)
--- a/mount_root.c
+++ b/mount_root.c
@@ -27,14 +27,16 @@
 static int
 start(int argc, char *argv[1])
 {
-       struct volume *root;
+       struct volume *root = volume_find("rootfs");
        struct volume *data = volume_find("rootfs_data");
 
-       if (!getenv("PREINIT"))
+       if (data && find_mount_point(data->blk, 0))
+               return -1;
+
+       if (root && find_mount_point(root->blk, 0))
                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);