From owner-freebsd-bugs@FreeBSD.ORG Fri Nov 12 18:00:46 2004 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6447716A4D1 for ; Fri, 12 Nov 2004 18:00:46 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42C1543D46 for ; Fri, 12 Nov 2004 18:00:46 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.11/8.12.11) with ESMTP id iACI0k9c098891 for ; Fri, 12 Nov 2004 18:00:46 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id iACI0kfP098882; Fri, 12 Nov 2004 18:00:46 GMT (envelope-from gnats) Resent-Date: Fri, 12 Nov 2004 18:00:46 GMT Resent-Message-Id: <200411121800.iACI0kfP098882@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Steve Kargl Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E9B916A4CE for ; Fri, 12 Nov 2004 17:58:36 +0000 (GMT) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.208.78.105]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAC0943D46 for ; Fri, 12 Nov 2004 17:58:35 +0000 (GMT) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) iACHwZsO020699 for ; Fri, 12 Nov 2004 09:58:35 -0800 (PST) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost)iACHwZBU020698; Fri, 12 Nov 2004 09:58:35 -0800 (PST) (envelope-from sgk) Message-Id: <200411121758.iACHwZBU020698@troutmask.apl.washington.edu> Date: Fri, 12 Nov 2004 09:58:35 -0800 (PST) From: Steve Kargl To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: bin/73878: [PATCH] sysinstall: catch up with cuaa* rename to cuad* X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2004 18:00:46 -0000 >Number: 73878 >Category: bin >Synopsis: [PATCH] sysinstall: catch up with cuaa* rename to cuad* >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Nov 12 18:00:45 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Steve Kargl >Release: FreeBSD 5.2-CURRENT i386 >Organization: APL/UW >Environment: System: FreeBSD troutmask.apl.washington.edu 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Thu Apr 22 14:44:25 PDT 2004 kargl@troutmask.apl.washington.edu:/usr/obj/usr/src/sys/TROUTMASK i386 >Description: >From /usr/src/UPATING 20041018: A major sweep over the tty drivers to elimnate approx 3100 lines of copy&pasted code have been performed. As a part of this change some tty devices have changed names: sio devices are now named: {tty,cua}d%d[.init,.lock] ucom devices are now named: {tty,cua}U%d[.init,.lock] For other drivers see the commit logs. See patch for OBVIOUS fix. >How-To-Repeat: >Fix: diff -ur sysinstall.orig/devices.c sysinstall/devices.c --- sysinstall.orig/devices.c Sun Sep 12 10:06:57 2004 +++ sysinstall/devices.c Fri Nov 12 09:51:35 2004 @@ -134,7 +134,7 @@ { DEVICE_TYPE_NETWORK, "wx", "Intel Gigabit Ethernet (82452) card" }, { DEVICE_TYPE_NETWORK, "xe", "Xircom/Intel EtherExpress Pro100/16 ethernet card" }, { DEVICE_TYPE_NETWORK, "xl", "3COM 3c90x / 3c90xB PCI ethernet card" }, - { DEVICE_TYPE_NETWORK, "cuaa%d", "%s on device %s (COM%d)", 28, 128, 1, 16 }, + { DEVICE_TYPE_NETWORK, "cuad%d", "%s on device %s (COM%d)", 28, 128, 1, 16 }, { DEVICE_TYPE_NETWORK, "fwe", "FireWire Ethernet emulation" }, { DEVICE_TYPE_NETWORK, "lp", "Parallel Port IP (PLIP) peer connection" }, { DEVICE_TYPE_NETWORK, "lo", "Loop-back (local) network interface" }, diff -ur sysinstall.orig/menus.c sysinstall/menus.c --- sysinstall.orig/menus.c Thu Nov 11 21:07:46 2004 +++ sysinstall/menus.c Fri Nov 12 09:51:27 2004 @@ -410,10 +410,10 @@ { { "1 BusMouse", "PC-98x1 bus mouse (/dev/mse0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" }, - { "2 COM1", "Serial mouse on COM1 (/dev/cuaa0)", - dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa0" }, - { "3 COM2", "Serial mouse on COM2 (/dev/cuaa1)", - dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa1" }, + { "2 COM1", "Serial mouse on COM1 (/dev/cuad0)", + dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuad0" }, + { "3 COM2", "Serial mouse on COM2 (/dev/cuad1)", + dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuad1" }, { NULL } }, }; #else @@ -426,14 +426,14 @@ NULL, { { "1 PS/2", "PS/2 style mouse (/dev/psm0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/psm0" }, - { "2 COM1", "Serial mouse on COM1 (/dev/cuaa0)", - dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa0" }, - { "3 COM2", "Serial mouse on COM2 (/dev/cuaa1)", - dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa1" }, - { "4 COM3", "Serial mouse on COM3 (/dev/cuaa2)", - dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa2" }, - { "5 COM4", "Serial mouse on COM4 (/dev/cuaa3)", - dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa3" }, + { "2 COM1", "Serial mouse on COM1 (/dev/cuad0)", + dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuad0" }, + { "3 COM2", "Serial mouse on COM2 (/dev/cuad1)", + dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuad1" }, + { "4 COM3", "Serial mouse on COM3 (/dev/cuad2)", + dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuad2" }, + { "5 COM4", "Serial mouse on COM4 (/dev/cuad3)", + dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuad3" }, { "6 BusMouse", "Logitech, ATI or MS bus mouse (/dev/mse0)", dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" }, { NULL } }, >Release-Note: >Audit-Trail: >Unformatted: