Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-02-27 21:02:01 -0800
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-02-27 21:02:01 -0800
commit22e678470469b15ddf151694859673836b2abeae (patch)
tree79e17f01d0832f7e2799d710c247e96f7a3bab91
parent52f4fc0bb8d242e2835d6147016fed99f66ce8cd (diff)
defconfig changes, /bin/sh boottime fallback fix
-rw-r--r--arch/i386/defconfig7
-rw-r--r--init/main.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 951ceed0b2d7..4a10517ab77e 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -105,6 +105,7 @@ CONFIG_CARDBUS=y
# CONFIG_HOTPLUG_PCI is not set
# CONFIG_HOTPLUG_PCI_COMPAQ is not set
# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
+# CONFIG_HOTPLUG_PCI_IBM is not set
CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set
CONFIG_BINFMT_AOUT=y
@@ -132,7 +133,7 @@ CONFIG_PARPORT_PC_CML1=y
# CONFIG_PARPORT_GSC is not set
# CONFIG_PARPORT_SUNBPP is not set
# CONFIG_PARPORT_OTHER is not set
-CONFIG_PARPORT_1284=y
+# CONFIG_PARPORT_1284 is not set
#
# Plug and Play configuration
@@ -685,6 +686,7 @@ CONFIG_NFS_FS=y
# CONFIG_ROOT_NFS is not set
CONFIG_NFSD=y
# CONFIG_NFSD_V3 is not set
+# CONFIG_NFSD_TCP is not set
CONFIG_SUNRPC=y
CONFIG_LOCKD=y
# CONFIG_SMB_FS is not set
@@ -727,13 +729,14 @@ CONFIG_SOUND=y
# Advanced Linux Sound Architecture
#
CONFIG_SND=y
-# CONFIG_SND_RTCTIMER is not set
CONFIG_SND_SEQUENCER=y
# CONFIG_SND_SEQ_DUMMY is not set
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=y
CONFIG_SND_PCM_OSS=y
CONFIG_SND_SEQUENCER_OSS=y
+# CONFIG_SND_RTCTIMER is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set
#
diff --git a/init/main.c b/init/main.c
index ddc2ae8ca125..9a810361e27a 100644
--- a/init/main.c
+++ b/init/main.c
@@ -460,6 +460,8 @@ extern void prepare_namespace(void);
static int init(void * unused)
{
+ static char * argv_sh[] = { "sh", NULL, };
+
lock_kernel();
do_basic_setup();
@@ -491,6 +493,6 @@ static int init(void * unused)
execve("/sbin/init",argv_init,envp_init);
execve("/etc/init",argv_init,envp_init);
execve("/bin/init",argv_init,envp_init);
- execve("/bin/sh",argv_init,envp_init);
+ execve("/bin/sh",argv_sh,envp_init);
panic("No init found. Try passing init= option to kernel.");
}