From 20db58e37e32316fa308d5f15d18248aca8ae43a Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 7 Jun 2004 10:41:48 +0000 Subject: nasty kernel now gives us weird PIDs, so we can't rely on this to detect if we are running on a live box or not. So set testing to 0 --- mdk-stage1/init.c | 5 +---- mdk-stage1/stage1.c | 12 ++++-------- 2 files changed, 5 insertions(+), 12 deletions(-) (limited to 'mdk-stage1') diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index 8d9035b33..58dc64bd8 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -56,7 +56,7 @@ char * env[] = { * */ -int testing; +int testing = 0; int klog_pid; @@ -445,9 +445,6 @@ int main(int argc, char **argv) return 0; } - /* getpid() != 1 should work, by linuxrc tends to get a larger pid */ - testing = (getpid() > 50); - if (!testing) { /* turn off screen blanking */ printf("\033[9;0]"); diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 8306772b0..ffb782162 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -593,14 +593,10 @@ void finish_preparing(void) int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)), char **env) { - if (getpid() > 50) - set_param(MODE_TESTING); - else { - mkdir(SLASH_LOCATION, 0755); - if (scall(mount("none", SLASH_LOCATION, "tmpfs", MS_MGC_VAL, NULL), "mount tmpfs")) - fatal_error("Fatal error initializing."); - mkdir(SLASH_LOCATION "/tmp", 0755); - } + mkdir(SLASH_LOCATION, 0755); + if (scall(mount("none", SLASH_LOCATION, "tmpfs", MS_MGC_VAL, NULL), "mount tmpfs")) + fatal_error("Fatal error initializing."); + mkdir(SLASH_LOCATION "/tmp", 0755); spawn_interactive(); -- cgit v1.2.1