defconfig changes, /bin/sh boottime fallback fix

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
 
 #

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.");
 }