patch-2.1.45 linux/init/main.c

• Lines: 50
• Date: Wed Jul 16 19:22:51 1997
• Orig file: v2.1.44/linux/init/main.c
• Orig date: Mon Jun 16 16:36:01 1997

diff -u --recursive --new-file v2.1.44/linux/init/main.c linux/init/main.c
@@ -32,7 +32,6 @@
 #include <linux/slab.h>
 #include <linux/major.h>
 #include <linux/blk.h>
-#include <linux/nametrans.h>
 #include <linux/init.h>
 #ifdef CONFIG_ROOT_NFS
 #include <linux/nfs_fs.h>
@@ -559,12 +558,6 @@
 		return 1;
 	}
 #endif
-#ifdef CONFIG_TRANS_NAMES
-	if(!strncmp(line,"nametrans=",10)) {
-		nametrans_setup(line+10);
-		return 1;
-	}
-#endif
 	while (bootsetups[i].str) {
 		int n = strlen(bootsetups[i].str);
 		if (!strncmp(line,bootsetups[i].str,n)) {
@@ -758,6 +751,12 @@
 		if (!strncmp(line,"init=",5)) {
 			line += 5;
 			execute_command = line;
+			/* In case LILO is going to boot us with default command line,
+			 * it prepends "auto" before the whole cmdline which makes
+			 * the shell think it should execute a script with such name.
+			 * So we ignore all arguments entered _before_ init=... [MJ]
+			 */
+			args = 0;
 			continue;
 		}
 		if (checksetup(line))
@@ -886,7 +885,6 @@
 	memory_start = kmem_cache_init(memory_start, memory_end);
 	sti();
 	calibrate_delay();
-	memory_start = name_cache_init(memory_start,memory_end);
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (initrd_start && !initrd_below_start_ok && initrd_start < memory_start) {
 		printk(KERN_CRIT "initrd overwritten (0x%08lx < 0x%08lx) - "
@@ -901,6 +899,7 @@
 #endif
 	uidcache_init();
 	filescache_init();
+	dcache_init();
 	vma_init();
 	buffer_init();
 	inode_init();