From b123e6178d1eb3be5172d60fbe7317d64bb7662d Mon Sep 17 00:00:00 2001 From: Nigel Cunningham Date: Thu, 17 May 2007 06:28:36 +1000 Subject: [PATCH] Correct position of check_resume_attempted. Don't check resume was attempted after mounting the root directory! Not a biggie because no userspace program can run before we do the resume (if we do), but nevertheless wrong. Signed-off-by: Nigel Cunningham --- init/do_mounts.c | 2 ++ init/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/init/do_mounts.c b/init/do_mounts.c index f9d522aaaa0..54efef28ca8 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -443,6 +443,8 @@ void __init prepare_namespace(void) if (is_floppy && rd_doload && rd_load_disk(0)) ROOT_DEV = Root_RAM0; + check_resume_attempted(); + mount_root(); out: sys_mount(".", "/", NULL, MS_MOVE, NULL); diff --git a/init/main.c b/init/main.c index a6e06314e80..534deb07004 100644 --- a/init/main.c +++ b/init/main.c @@ -755,8 +755,6 @@ static int init(void * unused) ramdisk_execute_command); } - check_resume_attempted(); - /* * We try each of these until one succeeds. * -- 2.11.4.GIT