bin/73879: [PATCH] ppp: catch up with cuaa* rename to cuad*
Steve Kargl
sgk at troutmask.apl.washington.edu
Fri Nov 12 10:10:29 PST 2004
>Number: 73879
>Category: bin
>Synopsis: [PATCH] ppp: 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:10:29 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 at troutmask.apl.washington.edu:/usr/obj/usr/src/sys/TROUTMASK i386
>Description:
>From /usr/src/UPDATING:
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 OBVIOUS patch.
>How-To-Repeat:
>Fix:
diff -ur ppp.orig/README.changes ppp/README.changes
--- ppp.orig/README.changes Mon Jun 4 07:38:28 2001
+++ ppp/README.changes Fri Nov 12 10:03:37 2004
@@ -53,7 +53,7 @@
written to the TCP/IP log.
o Any number of diagnostic prompts are allowed, and they are allowed in
interactive mode.
-o The default `device' is cuaa1, then cuaa0
+o The default `device' is cuad1, then cuad0
o A password of "*" in ppp.secret causes a passwd database lookup in
pap mode.
o The value of the CONNECT environment variable is logged in the
diff -ur ppp.orig/defs.h ppp/defs.h
--- ppp.orig/defs.h Sun Sep 12 10:06:51 2004
+++ ppp/defs.h Fri Nov 12 10:03:19 2004
@@ -30,7 +30,7 @@
/* Check the following definitions for your machine environment */
#ifdef __FreeBSD__
-# define MODEM_LIST "/dev/cuaa1\0/dev/cuaa0" /* name of tty device */
+# define MODEM_LIST "/dev/cuad1\0/dev/cuad0" /* name of tty device */
#else
# ifdef __OpenBSD__
# define MODEM_LIST "/dev/cua01\0/dev/cua00" /* name of tty device */
diff -ur ppp.orig/ppp.8.m4 ppp/ppp.8.m4
--- ppp.orig/ppp.8.m4 Wed Jul 28 22:59:43 2004
+++ ppp/ppp.8.m4 Fri Nov 12 10:02:56 2004
@@ -572,7 +572,7 @@
.Pp
You can start by specifying the device name and speed:
.Bd -literal -offset indent
-ppp ON awfulhak> set device /dev/cuaa0
+ppp ON awfulhak> set device /dev/cuad0
ppp ON awfulhak> set speed 38400
.Ed
.Pp
@@ -631,7 +631,7 @@
Phone Number: N/A
Defaults:
- Device List: /dev/cuaa0
+ Device List: /dev/cuad0
Characteristics: 38400bps, cs8, even parity, CTS/RTS on
Connect time: 0 secs
@@ -1219,10 +1219,10 @@
as the getty:
.Bd -literal -offset indent
# ppp
-ppp ON awfulhak> set device /dev/cuaa1
+ppp ON awfulhak> set device /dev/cuad1
ppp ON awfulhak> set speed 38400
ppp ON awfulhak> term
-deflink: Entering terminal mode on /dev/cuaa1
+deflink: Entering terminal mode on /dev/cuad1
Type `~?' for help
at
OK
@@ -2170,11 +2170,11 @@
.Dq set speed
to specify your serial line and speed, for example:
.Bd -literal -offset indent
-set device /dev/cuaa0
+set device /dev/cuad0
set speed 115200
.Ed
.Pp
-Cuaa0 is the first serial port on
+Cuad0 is the first serial port on
.Fx .
If you're running
.Nm
@@ -2536,7 +2536,7 @@
mp:
set timeout 0
set log phase chat
- set device /dev/cuaa0 /dev/cuaa1 /dev/cuaa2
+ set device /dev/cuad0 /dev/cuad1 /dev/cuad2
set phone "123456789"
set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \\"\\" ATZ \e
OK-AT-OK \\\\dATDT\\\\T TIMEOUT 45 CONNECT"
@@ -2573,9 +2573,9 @@
command:
.Pp
.Bd -literal -offset indent
- link 1 set device /dev/cuaa0
- link 2 set device /dev/cuaa1
- link 3 set device /dev/cuaa2
+ link 1 set device /dev/cuad0
+ link 2 set device /dev/cuad1
+ link 3 set device /dev/cuad2
.Ed
.Pp
Use the
@@ -3994,7 +3994,7 @@
.Sq deflink .
Renaming it to
.Sq modem ,
-.Sq cuaa0
+.Sq cuad0
or
.Sq USR
may make the log file more readable.
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-bugs
mailing list