patch-1.3.75 linux/init/main.c

• Lines: 33
• Date: Sat Mar 16 13:52:09 1996
• Orig file: v1.3.74/linux/init/main.c
• Orig date: Fri Mar 15 16:03:21 1996

diff -u --recursive --new-file v1.3.74/linux/init/main.c linux/init/main.c
@@ -60,6 +60,7 @@
 extern long pci_init(long, long);
 extern void sysctl_init(void);
 
+extern void no_scroll(char *str, int *ints);
 extern void swap_setup(char *str, int *ints);
 extern void buff_setup(char *str, int *ints);
 extern void panic_setup(char *str, int *ints);
@@ -222,6 +223,7 @@
 	{ "swap=", swap_setup },
 	{ "buff=", buff_setup },
 	{ "panic=", panic_setup },
+	{ "no-scroll", no_scroll },
 #ifdef CONFIG_BUGi386
 	{ "no-hlt", no_halt },
 	{ "no387", no_387 },
@@ -794,6 +796,7 @@
 	real_root_dev = ROOT_DEV;
 	real_root_mountflags = root_mountflags;
 	if (initrd_start && mount_initrd) root_mountflags &= ~MS_RDONLY;
+	else mount_initrd =0;
 #endif
 	setup();
 
@@ -823,7 +826,7 @@
 
 #ifdef CONFIG_BLK_DEV_INITRD
 	root_mountflags = real_root_mountflags;
-	if (ROOT_DEV != real_root_dev && ROOT_DEV == MKDEV(RAMDISK_MAJOR,0)) {
+	if (mount_initrd && ROOT_DEV != real_root_dev && ROOT_DEV == MKDEV(RAMDISK_MAJOR,0)) {
 		int error;
 
 		pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD);