From 6e1ec48c90efa4aaa0c7c3db96c9b9583c35f2c4 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 17 Jun 2005 23:10:11 +0000 Subject: [PATCH] Mop up OLDCARD remains. --- etc/Makefile | 8 +++- etc/rc.d/pccard | 72 ----------------------------------- etc/usbd.conf | 5 +-- share/man/man4/man4.i386/fe.4 | 5 +-- share/man/man5/rc.conf.5 | 35 +---------------- share/man/man8/Makefile | 4 +- share/man/man8/rc.8 | 6 +-- usr.sbin/usbd/usbd.conf.5 | 4 +- 8 files changed, 17 insertions(+), 122 deletions(-) delete mode 100644 etc/rc.d/pccard diff --git a/etc/Makefile b/etc/Makefile index 139694c188..6676f49362 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,6 +1,6 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $ -# $DragonFly: src/etc/Makefile,v 1.61 2005/06/14 16:50:43 swildner Exp $ +# $DragonFly: src/etc/Makefile,v 1.62 2005/06/17 23:10:11 swildner Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -143,7 +143,13 @@ upgrade_etc: preupgrade .endif ldconfig -m ${DESTDIR}/usr/lib/gcc2 rm -f ${DESTDIR}/usr/sbin/pccardc ${DESTDIR}/usr/sbin/pccardd + rm -f ${DESTDIR}/usr/share/examples/etc/defaults/pccard.conf + csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}5/pccard.conf.5.gz" + csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}8/pccardc.8.gz" + csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}8/pccardd.8.gz" + csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}8/rc.pccard.8.gz" rm -f ${DESTDIR}/etc/defaults/pccard ${DESTDIR}/etc/rc.d/pccard + rm -f ${DESTDIR}/etc/defaults/pccard.conf .if exists(${DESTDIR}/usr/libexec/gcc34) && exists(${DESTDIR}/usr/libexec/binutils215) rm -rf ${DESTDIR}/usr/lib/gcc3 rm -rf ${DESTDIR}/usr/libexec/gcc3 diff --git a/etc/rc.d/pccard b/etc/rc.d/pccard deleted file mode 100644 index 6c1909265f..0000000000 --- a/etc/rc.d/pccard +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 1996 The FreeBSD Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# $FreeBSD: src/etc/rc.d/pccard,v 1.28 2003/02/12 04:12:23 imp Exp $ -# $DragonFly: src/etc/rc.d/Attic/pccard,v 1.2 2004/01/27 00:42:45 rob Exp $ -# - -# PROVIDE: pccard -# REQUIRE: mountcritlocal -# KEYWORD: DragonFly - -. /etc/rc.subr - -name="pccard" -start_cmd="pccard_start" -stop_cmd=":" - -pccard_start() -{ - if [ ! -c /dev/card0 ]; then - exit 0 - fi - if checkyesno pccard_enable; then - echo -n 'Setup PC-CARD:' - - case ${pccard_mem} in - [Dd][Ee][Ff][Aa][Uu][Ll][Tt]) - pccardc pccardmem 0xd0000 1>/dev/null && echo -n ' memory' - ;; - *) - pccardc pccardmem ${pccard_mem} 1>/dev/null && echo -n ' memory' - ;; - esac - - if [ -n "${pccard_beep}" ]; then - pccardc beep ${pccard_beep} && echo -n ' beep' - fi - - if [ -n "${pccard_conf}" ]; then - pccardd_flags="${pccardd_flags} -f ${pccard_conf}" - fi - - pccardd ${pccardd_flags} && echo -n ' pccardd' - echo '.' - fi -} - -load_rc_config $name -run_rc_command "$1" diff --git a/etc/usbd.conf b/etc/usbd.conf index aebd174e7d..064d95006d 100644 --- a/etc/usbd.conf +++ b/etc/usbd.conf @@ -3,7 +3,7 @@ # See usbd.conf(5) for the description of the format of the file. # # $FreeBSD: src/etc/usbd.conf,v 1.5.2.3 2002/11/04 08:05:44 dougb Exp $ -# $DragonFly: src/etc/usbd.conf,v 1.2 2003/06/17 04:24:45 dillon Exp $ +# $DragonFly: src/etc/usbd.conf,v 1.3 2005/06/17 23:10:11 swildner Exp $ # Firmware download into the ActiveWire board. After the firmware download is # done the device detaches and reappears as something new and shiny automatically. @@ -24,8 +24,7 @@ device "Entrega Serial with UART" attach "/usr/sbin/ezdownload -v -f /usr/share/usb/firmware/1645.8001.0101 /dev/${DEVNAME}" # The entry below starts and stops dhclient when an ethernet device is inserted -# Caveat: It does not support multiple interfaces (but neither does pccardd, -# it shouldn't be too big a deal :-) +# Caveat: It does not support multiple interfaces. # device "USB ethernet" devname "[ack]ue[0-9]+" diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4 index 123ac23013..f351b7d749 100644 --- a/share/man/man4/man4.i386/fe.4 +++ b/share/man/man4/man4.i386/fe.4 @@ -22,7 +22,7 @@ .\" for fe driver. .\" .\" $FreeBSD: src/share/man/man4/man4.i386/fe.4,v 1.14.2.8 2001/10/10 11:43:53 murray Exp $ -.\" $DragonFly: src/share/man/man4/man4.i386/fe.4,v 1.2 2003/06/17 04:36:59 dillon Exp $ +.\" $DragonFly: src/share/man/man4/man4.i386/fe.4,v 1.3 2005/06/17 23:10:11 swildner Exp $ .Dd March 3, 1996 .Dt FE 4 i386 .Os @@ -242,8 +242,7 @@ It requires the PC card (PCMCIA) support package. .Xr ed 4 , .Xr netintro 4 , .Xr ng_ether 4 , -.Xr ifconfig 8 , -.Xr pccardd 8 +.Xr ifconfig 8 .Sh BUGS Following are major known bugs: .Pp diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 518e5d161d..41d1ecda94 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.197 2003/07/28 13:56:00 mbr Exp $ -.\" $DragonFly: src/share/man/man5/rc.conf.5,v 1.12 2005/05/30 00:54:46 swildner Exp $ +.\" $DragonFly: src/share/man/man5/rc.conf.5,v 1.13 2005/06/17 23:10:11 swildner Exp $ .Dd March 3, 2002 .Dt RC.CONF 5 .Os @@ -138,16 +138,6 @@ daemon. Run .Xr devd 8 to handle device added, removed or unknown events from the kernel. -.It Va pccard_enable -.Pq Vt bool -If set to -.Dq Li YES , -enable PCCARD support at boot time. -.It Va pccard_mem -.Pq Vt str -Set to PCCARD controller memory address or -.Dq Li DEFAULT -for the default value. .It Va pccard_ifconfig .Pq Vt str List of arguments to be passed to @@ -158,29 +148,6 @@ insertion of the card (e.g.\& for a fixed address or .Dq Li DHCP for a DHCP client). -.It Va pccard_beep -.Pq Vt int -If 0, -set the PCCARD controller to silent mode. -If 1, -set it to beep mode. -If 2, -set it to melody mode. -.It Va pccard_conf -.Pq Vt str -Path to the configuration file for the -.Xr pccardd 8 -daemon (e.g.\& -.Pa /etc/pccard.conf.sample ) . -.It Va pccardd_flags -.Pq Vt str -If -.Va pccard_enable -is set to -.Dq Li YES , -these are the flags to pass to the -.Xr pccardd 8 -daemon. .It Va pccard_ether_delay .Pq Vt str Set the delay before starting diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile index 868100d14a..e58c7a6d34 100644 --- a/share/man/man8/Makefile +++ b/share/man/man8/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD: src/share/man/man8/Makefile,v 1.13.2.12 2002/07/16 14:05:30 ru Exp $ -# $DragonFly: src/share/man/man8/Makefile,v 1.5 2005/02/26 09:46:31 asmodai Exp $ +# $DragonFly: src/share/man/man8/Makefile,v 1.6 2005/06/17 23:10:11 swildner Exp $ MAN= adding_user.8 \ crash.8 \ @@ -13,7 +13,7 @@ MAN= adding_user.8 \ sticky.8 \ yp.8 -MLINKS= rc.8 rc.early.8 rc.8 rc.serial.8 rc.8 rc.pccard.8 rc.8 rc.network.8 +MLINKS= rc.8 rc.early.8 rc.8 rc.serial.8 rc.8 rc.network.8 MLINKS+=rc.8 rc.firewall.8 rc.8 rc.atm.8 rc.8 rc.local.8 rc.8 rc.shutdown.8 MLINKS+=yp.8 YP.8 yp.8 NIS.8 yp.8 nis.8 diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8 index 654a603021..788b2e3bf6 100644 --- a/share/man/man8/rc.8 +++ b/share/man/man8/rc.8 @@ -34,7 +34,7 @@ .\" .\" @(#)rc.8 8.2 (Berkeley) 12/11/93 .\" $FreeBSD: src/share/man/man8/rc.8,v 1.22 2002/12/12 17:25:58 ru Exp $ -.\" $DragonFly: src/share/man/man8/rc.8,v 1.4 2004/03/11 12:28:57 hmp Exp $ +.\" $DragonFly: src/share/man/man8/rc.8,v 1.5 2005/06/17 23:10:11 swildner Exp $ .Dd November 4, 2002 .Dt RC 8 .Os @@ -409,10 +409,6 @@ The script is used to set any special configurations for serial devices. .Pp The -.Pa /etc/rc.d/pccard -script is used to enable PC-cards. -.Pp -The .Pa /etc/rc.d/network* scripts are used to start the network. The network is started in several passes. diff --git a/usr.sbin/usbd/usbd.conf.5 b/usr.sbin/usbd/usbd.conf.5 index 666ee19bca..8498e7dd58 100644 --- a/usr.sbin/usbd/usbd.conf.5 +++ b/usr.sbin/usbd/usbd.conf.5 @@ -24,7 +24,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD: src/usr.sbin/usbd/usbd.conf.5,v 1.13 2003/01/30 22:38:54 trhodes Exp $ -.\" $DragonFly: src/usr.sbin/usbd/usbd.conf.5,v 1.3 2003/12/30 01:01:48 dillon Exp $ +.\" $DragonFly: src/usr.sbin/usbd/usbd.conf.5,v 1.4 2005/06/17 23:10:11 swildner Exp $ .\" .\" Many parts of this manual have been snarfed from the pccard.conf (5) man .\" page, copyright by Andrew McRae. @@ -146,7 +146,7 @@ To start up moused for a newly attached mouse: attach "/usr/sbin/moused -p /dev/${DEVNAME} -I /var/run/moused.${DEVNAME}.pid" .Ed .Sh FILES -.Bl -tag -width /etc/pccard.conf -compact +.Bl -tag -width /etc/usbd.conf -compact .It Pa /etc/usbd.conf The .Nm usbd -- 2.41.0