From owner-freebsd-bugs@FreeBSD.ORG Fri Nov 12 18:30:32 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 4B8F016A4EB for ; Fri, 12 Nov 2004 18:30:32 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5229343D53 for ; Fri, 12 Nov 2004 18:30:23 +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 iACIUN4B004579 for ; Fri, 12 Nov 2004 18:30:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id iACIUM6A004570; Fri, 12 Nov 2004 18:30:22 GMT (envelope-from gnats) Resent-Date: Fri, 12 Nov 2004 18:30:22 GMT Resent-Message-Id: <200411121830.iACIUM6A004570@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 5AECE16A4CE for ; Fri, 12 Nov 2004 18:26:28 +0000 (GMT) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.208.78.105]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E67443D31 for ; Fri, 12 Nov 2004 18:26:28 +0000 (GMT) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) iACIQRgb021147 for ; Fri, 12 Nov 2004 10:26:27 -0800 (PST) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost)iACIQRZ0021146; Fri, 12 Nov 2004 10:26:27 -0800 (PST) (envelope-from sgk) Message-Id: <200411121826.iACIQRZ0021146@troutmask.apl.washington.edu> Date: Fri, 12 Nov 2004 10:26:27 -0800 (PST) From: Steve Kargl To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: misc/73881: [PATCH] share/examples: 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:30:32 -0000 >Number: 73881 >Category: misc >Synopsis: [PATCH] share/examples: catch up with cuaa* rename to cuad* >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Nov 12 18:30:22 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/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. >How-To-Repeat: >Fix: diff -ru examples.orig/ppp/ppp.conf.sample examples/ppp/ppp.conf.sample --- examples.orig/ppp/ppp.conf.sample Thu Apr 10 14:33:02 2003 +++ examples/ppp/ppp.conf.sample Fri Nov 12 10:22:31 2004 @@ -29,7 +29,7 @@ # default: set log Phase Chat LCP IPCP CCP tun command - set device /dev/cuaa1 + set device /dev/cuad1 set speed 115200 set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \"\" AT \ OK-AT-OK ATE1Q0 OK \\dATDT\\T TIMEOUT 40 CONNECT" @@ -145,7 +145,7 @@ set timeout 60 300 # The minimum charge period is 5 minutes, so don't # hangup before then - set device /dev/cuaa0 # Or whatever + set device /dev/cuad0 # Or whatever set speed 115200 # Use as high a speed as possible enable dns # Ask the peer what to put in resolv.conf @@ -315,7 +315,7 @@ dodgynet: set log Phase # Log link uptime allow mode auto # For autoconnect only - set device /dev/cuaa1 # Define modem device and speed + set device /dev/cuad1 # Define modem device and speed set speed 115200 deny lqr # Don't support LQR set phone 0W1194 # Remote system phone number, @@ -472,7 +472,7 @@ # direct-client: set dial - set device /dev/cuaa0 + set device /dev/cuad0 set sp 115200 set timeout 900 set lqrperiod 10 @@ -651,7 +651,7 @@ set cbcp set log +cbcp set redial 3 1 - set device /dev/cuaa0 + set device /dev/cuad0 set speed 115200 set dial "TIMEOUT 10 \"\" AT OK-AT-OK ATDT\\T CONNECT" @@ -680,7 +680,7 @@ # mloop: load loop - set device /dev/cuaa0 /dev/cuaa1 /dev/cuaa2 # Use any of these devices + set device /dev/cuad0 /dev/cuad1 /dev/cuad2 # Use any of these devices set mode interactive set mrru 1500 set mru 1504 # Room for the MP header diff -ru examples.orig/ppp/ppp.conf.span-isp examples/ppp/ppp.conf.span-isp --- examples.orig/ppp/ppp.conf.span-isp Thu Apr 10 14:33:02 2003 +++ examples/ppp/ppp.conf.span-isp Fri Nov 12 10:22:08 2004 @@ -104,7 +104,7 @@ default: set speed 115200 - set device /dev/cuaa0 /dev/cuaa1 /dev/cuaa2 /dev/cuaa3 + set device /dev/cuad0 /dev/cuad1 /dev/cuad2 /dev/cuad3 set dial "ABORT BUSY ABORT NO\\sCARRIER ABORT NO\\sDIAL\\sTONE TIMEOUT 4 \ \"\" ATZ OK-ATZ-OK ATDT\\T TIMEOUT 60 CONNECT \\c \\n" set login diff -ru examples.orig/pppd/options.sample examples/pppd/options.sample --- examples.orig/pppd/options.sample Mon Jan 28 16:23:33 2002 +++ examples/pppd/options.sample Fri Nov 12 10:21:49 2004 @@ -2,7 +2,7 @@ # # Example for /etc/ppp/options file. # -/dev/cuaa4 +/dev/cuad4 115200 modem crtscts diff -ru examples.orig/startslip/slip.sh examples/startslip/slip.sh --- examples.orig/startslip/slip.sh Fri Sep 15 13:15:10 1995 +++ examples/startslip/slip.sh Fri Nov 12 10:21:43 2004 @@ -1,4 +1,4 @@ #!/bin/sh startslip -b 57600 -U ./slup.sh -D ./sldown.sh \ -s atd -s atd -s atd \ - -h -t 60 -w 2 -W 20 /dev/cuaa1 + -h -t 60 -w 2 -W 20 /dev/cuad1 >Release-Note: >Audit-Trail: >Unformatted: