[src/trunk]: src/usr.sbin/sysinst/arch/i386 Fix merge mishap in rev 1.9/1.10 ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/06d1584f82a1
branches:  trunk
changeset: 433457:06d1584f82a1
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Sep 15 17:42:38 2018 +0000

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

diffstat:

 usr.sbin/sysinst/arch/i386/md.c |  16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)

diffs (30 lines):

diff -r 9ab6c47ec20c -r 06d1584f82a1 usr.sbin/sysinst/arch/i386/md.c
--- a/usr.sbin/sysinst/arch/i386/md.c   Sat Sep 15 17:06:32 2018 +0000
+++ b/usr.sbin/sysinst/arch/i386/md.c   Sat Sep 15 17:42:38 2018 +0000
@@ -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 @@
        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.