Bug 140887

Summary:	8.0: sysinstall(8) needs to update to new serial port name
Product:	Base System	Reporter:	Joe <fbsd1>
Component:	bin	Assignee:	Bruce Cran <brucec>
Status:	Closed FIXED
Severity:	Affects Only Me
Priority:	Normal
Version:	Unspecified
Hardware:	Any
OS:	Any

Description Joe 2009-11-26 07:10:01 UTC

The full release notes at http://www.freebsd.org/releases/8.0R/relnotes-detailed.html  say the following

[amd64, i386] The uart(4) is now the default driver for serial port devices in favor of the sio(4) driver. Note that the device nodes have been renamed with /dev/cuauN and /dev/ttyuN.

The sysinstall menu that configures the mouse has not been changed to reflect the new device names created by this change.

Maybe the /dev/ttyuN also needs updating somewhere in sysinstall also.

Fix: 

make change to sysinstall mouse configure menu
How-To-Repeat: plug in a serial mouse and use sysinstall to post statements in rc.conf. mouse will not work

Comment 1 randi freebsd_committer

2009-11-27 08:00:27 UTC

Responsible Changed
From-To: freebsd-i386->randi

mine.

Comment 2 dfilter service freebsd_committer

2010-11-29 11:28:40 UTC

Author: brucec
Date: Mon Nov 29 11:28:31 2010
New Revision: 216052
URL: http://svn.freebsd.org/changeset/base/216052

Log:
  Update the serial port device names. They changed in 8.0 because the default
  driver is now uart(4).
  
  PR:	bin/140887
  Submitted by:	Joe Barbish <fbsd1 at a1poweruser.com>
  MFC after:	3 days

Modified:
  head/usr.sbin/sysinstall/devices.c
  head/usr.sbin/sysinstall/menus.c

Modified: head/usr.sbin/sysinstall/devices.c
==============================================================================
--- head/usr.sbin/sysinstall/devices.c	Mon Nov 29 10:22:45 2010	(r216051)
+++ head/usr.sbin/sysinstall/devices.c	Mon Nov 29 11:28:31 2010	(r216052)
@@ -91,7 +91,7 @@ static struct _devname {
     DISK("ipsd%d",	"IBM ServeRAID RAID array",		4),
     DISK("mfid%d",	"LSI MegaRAID SAS array",		4),
     FLOPPY("fd%d",	"floppy drive unit A",			4),
-    SERIAL("cuad%d",	"%s on device %s (COM%d)",		16),
+    SERIAL("cuau%d",	"%s on device %s (COM%d)",		16),
     USB("da%da",	"USB Mass Storage Device",		16),
     NETWORK("ae",	"Attansic/Atheros L2 Fast Ethernet"),
     NETWORK("age",	"Attansic/Atheros L1 Gigabit Ethernet"),

Modified: head/usr.sbin/sysinstall/menus.c
==============================================================================
--- head/usr.sbin/sysinstall/menus.c	Mon Nov 29 10:22:45 2010	(r216051)
+++ head/usr.sbin/sysinstall/menus.c	Mon Nov 29 11:28:31 2010	(r216052)
@@ -426,10 +426,10 @@ DMenu MenuMousePort = {
     {
       { "1 BusMouse",	"PC-98x1 bus mouse (/dev/mse0)", 
 	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" },
-      { "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" },
+      { "2 COM1",	"Serial mouse on COM1 (/dev/cuau0)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau0" },
+      { "3 COM2",	"Serial mouse on COM2 (/dev/cuau1)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau1" },
       { NULL } },
 };
 #else
@@ -442,14 +442,14 @@ DMenu MenuMousePort = {
     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/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" },
+      { "2 COM1",	"Serial mouse on COM1 (/dev/cuau0)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau0" },
+      { "3 COM2",	"Serial mouse on COM2 (/dev/cuau1)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau1" },
+      { "4 COM3",	"Serial mouse on COM3 (/dev/cuau2)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau2" },
+      { "5 COM4",	"Serial mouse on COM4 (/dev/cuau3)", 
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau3" },
       { "6 BusMouse",	"Logitech, ATI or MS bus mouse (/dev/mse0)", 
 	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" },
       { NULL } },
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Comment 3 Bruce Cran freebsd_committer

2010-11-29 11:31:12 UTC

State Changed
From-To: open->patched

Fixed in r216052.

Comment 4 Bruce Cran freebsd_committer

2010-11-29 11:31:12 UTC

Responsible Changed
From-To: randi->brucec

Grab.

Comment 5 dfilter service freebsd_committer

2010-12-02 09:09:53 UTC

Author: brucec
Date: Thu Dec  2 09:09:46 2010
New Revision: 216116
URL: http://svn.freebsd.org/changeset/base/216116

Log:
  MFC r216052:
  Update the serial port device names. They changed in 8.0 because the
  default driver is now uart(4).
  
  PR:	bin/140887
  Submitted by:	Joe Barbish <fbsd1 at a1poweruser.com>
  
  MFC r216053:
  If no floppy drive is installed kldBrowser() can generate an error
  early on. Initialize menu and count so the cleanup code doesn't try
  and use their uninitialized values.
  
  PR:	bin/152270
  Submitted by:	Remi LAURENT <cloud at madpowah.org>
  
  Approved by:	re (kensmith)

Modified:
  stable/8/usr.sbin/sysinstall/devices.c
  stable/8/usr.sbin/sysinstall/menus.c
  stable/8/usr.sbin/sysinstall/modules.c
Directory Properties:
  stable/8/usr.sbin/sysinstall/   (props changed)

Modified: stable/8/usr.sbin/sysinstall/devices.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/devices.c	Thu Dec  2 06:40:21 2010	(r216115)
+++ stable/8/usr.sbin/sysinstall/devices.c	Thu Dec  2 09:09:46 2010	(r216116)
@@ -91,7 +91,7 @@ static struct _devname {
     DISK("ipsd%d",	"IBM ServeRAID RAID array",		4),
     DISK("mfid%d",	"LSI MegaRAID SAS array",		4),
     FLOPPY("fd%d",	"floppy drive unit A",			4),
-    SERIAL("cuad%d",	"%s on device %s (COM%d)",		16),
+    SERIAL("cuau%d",	"%s on device %s (COM%d)",		16),
     USB("da%da",	"USB Mass Storage Device",		16),
     NETWORK("ae",	"Attansic/Atheros L2 Fast Ethernet"),
     NETWORK("age",	"Attansic/Atheros L1 Gigabit Ethernet"),

Modified: stable/8/usr.sbin/sysinstall/menus.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/menus.c	Thu Dec  2 06:40:21 2010	(r216115)
+++ stable/8/usr.sbin/sysinstall/menus.c	Thu Dec  2 09:09:46 2010	(r216116)
@@ -426,10 +426,10 @@ DMenu MenuMousePort = {
     {
       { "1 BusMouse",	"PC-98x1 bus mouse (/dev/mse0)", 
 	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" },
-      { "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" },
+      { "2 COM1",	"Serial mouse on COM1 (/dev/cuau0)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau0" },
+      { "3 COM2",	"Serial mouse on COM2 (/dev/cuau1)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau1" },
       { NULL } },
 };
 #else
@@ -442,14 +442,14 @@ DMenu MenuMousePort = {
     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/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" },
+      { "2 COM1",	"Serial mouse on COM1 (/dev/cuau0)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau0" },
+      { "3 COM2",	"Serial mouse on COM2 (/dev/cuau1)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau1" },
+      { "4 COM3",	"Serial mouse on COM3 (/dev/cuau2)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau2" },
+      { "5 COM4",	"Serial mouse on COM4 (/dev/cuau3)", 
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau3" },
       { "6 BusMouse",	"Logitech, ATI or MS bus mouse (/dev/mse0)", 
 	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" },
       { NULL } },

Modified: stable/8/usr.sbin/sysinstall/modules.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/modules.c	Thu Dec  2 06:40:21 2010	(r216115)
+++ stable/8/usr.sbin/sysinstall/modules.c	Thu Dec  2 09:09:46 2010	(r216116)
@@ -123,13 +123,14 @@ driverFloppyCheck(void)
 int
 kldBrowser(dialogMenuItem *self)
 {
-    DMenu	*menu;
+    DMenu	*menu = NULL;
     int		i, what = DITEM_SUCCESS, msize, count;
     DIR		*dir;
     struct dirent *de;
     char	*err;
     
     err = NULL;
+    count = 0;
     
     if (DITEM_STATUS(mediaSetFloppy(NULL)) == DITEM_FAILURE) {
 	err = "Unable to set media device to floppy.";
@@ -142,7 +143,6 @@ kldBrowser(dialogMenuItem *self)
     }
 
     msize = sizeof(DMenu) + (sizeof(dialogMenuItem) * 2);
-    count = 0;
     if ((menu = malloc(msize)) == NULL) {
 	err = "Failed to allocate memory for menu";
 	goto errout;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Comment 6 Bruce Cran freebsd_committer

2010-12-02 09:11:50 UTC

State Changed
From-To: patched->closed

Merged to stable/8.