patch-2.1.31 linux/init/main.c

• Lines: 31
• Date: Thu Mar 27 14:36:39 1997
• Orig file: v2.1.30/linux/init/main.c
• Orig date: Thu Mar 27 14:40:12 1997

diff -u --recursive --new-file v2.1.30/linux/init/main.c linux/init/main.c
@@ -298,7 +298,9 @@
 	{ "swap=", swap_setup },
 	{ "buff=", buff_setup },
 	{ "panic=", panic_setup },
+#ifdef CONFIG_VT
 	{ "no-scroll", no_scroll },
+#endif
 #ifdef CONFIG_BUGi386
 	{ "no-hlt", no_halt },
 	{ "no387", no_387 },
@@ -1014,17 +1016,9 @@
 	}
 #endif
 
-#ifdef __sparc__
-        if (serial_console == 1) {
-                (void) open("/dev/cua0", O_RDWR, 0);
-        } else if (serial_console == 2) {
-                (void) open("/dev/cua1", O_RDWR, 0);
-        } else {
-#endif
-                (void) open("/dev/tty1", O_RDWR, 0);
-#ifdef __sparc__
-        }
-#endif
+	if (open("/dev/console",O_RDWR,0) < 0)
+		printk("Unable to open an initial console.\n");
+
 	(void) dup(0);
 	(void) dup(0);