Module Name:    src
Committed By:   martin
Date:           Sat Sep 15 17:42:38 UTC 2018

Modified Files:
        src/usr.sbin/sysinst/arch/i386: md.c

Log Message:
Fix merge mishap in rev 1.9/1.10 - remove accidently duplicated
code. No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/arch/i386/md.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/sysinst/arch/i386/md.c
diff -u src/usr.sbin/sysinst/arch/i386/md.c:1.11 src/usr.sbin/sysinst/arch/i386/md.c:1.12
--- src/usr.sbin/sysinst/arch/i386/md.c:1.11	Sun Jun  3 18:59:45 2018
+++ src/usr.sbin/sysinst/arch/i386/md.c	Sat Sep 15 17:42:38 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.11 2018/06/03 18:59:45 christos Exp $ */
+/*	$NetBSD: md.c,v 1.12 2018/09/15 17:42:38 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -317,20 +317,6 @@ md_post_newfs(void)
 	struct termios t;
 	dev_t condev;
 
-	/*
-	 * Get console device, should either be ttyE0 or tty0n.
-	 * Too hard to double check, so just 'know' the device numbers.
-	 */
-	len = sizeof condev;
-	if (sysctl(conmib, __arraycount(conmib), &condev, &len, NULL, 0) != -1
-	    && (condev & ~3) == 0x800) {
-		/* Motherboard serial port */
-		boottype.bp_consdev = (condev & 3) + 1;
-		/* Defaulting the baud rate to that of stdin should suffice */
-		if (tcgetattr(0, &t) != -1)
-			boottype.bp_conspeed = t.c_ispeed;
-	}
-
 	if (pm == NULL || !pm->no_part) {
 		/*
 		 * Get console device, should either be ttyE0 or tty0n.

Reply via email to