diff options
author | iwasaki <iwasaki@FreeBSD.org> | 2000-03-30 16:01:37 +0000 |
---|---|---|
committer | iwasaki <iwasaki@FreeBSD.org> | 2000-03-30 16:01:37 +0000 |
commit | 6b6649defb06b71eb7eaf18f03ab90bd0e581141 (patch) | |
tree | 53e524adbcbdcaf92cbcf412082f07e07f2bc590 /usr.sbin/pccard/pccardd/pccard.conf.5 | |
parent | 29f3da7a25badcfdfae94cc1588d420b9c5386db (diff) | |
download | FreeBSD-src-6b6649defb06b71eb7eaf18f03ab90bd0e581141.zip FreeBSD-src-6b6649defb06b71eb7eaf18f03ab90bd0e581141.tar.gz |
- default config file changed from /etc/pccard.conf to
/etc/defaults/pccard.conf in pccardd. But system default pccardd
config file is still /etc/pccard.conf.sample specified in /etc/rc.conf
for the testing this changes.
- improved `include' keyword function for error handling.
- now that resource pool (io, irq, mem) can be overridden.
- pccard config entries is searched following the first match rule if
there are more than two entries which have the same card identifier.
Note that the /etc/defaults/pccard.conf related files is not committed
at this time, will come a week later. I'll prepare the test version
of /etc/defaults/pccard.conf, /etc/pccard.conf and other files soon.
Reviewed by: imp and nomads in Japan.
Diffstat (limited to 'usr.sbin/pccard/pccardd/pccard.conf.5')
-rw-r--r-- | usr.sbin/pccard/pccardd/pccard.conf.5 | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/usr.sbin/pccard/pccardd/pccard.conf.5 b/usr.sbin/pccard/pccardd/pccard.conf.5 index 999f18e..1aaf4c6 100644 --- a/usr.sbin/pccard/pccardd/pccard.conf.5 +++ b/usr.sbin/pccard/pccardd/pccard.conf.5 @@ -54,6 +54,17 @@ and The latter two may appear in any order, and may be interspersed as desired. .Pp +The +.Pa /etc/pccard.conf +file is included from the file +.Pa /etc/defaults/pccard.conf , +which contains the default resource pool settings and +pccard identifiers database. +The user specific configuration can be specified in +.Pa /etc/rc.conf +when the user wishes to override these defaults and/or +add additional entries. +.Pp Each PC-CARD card contains configuration tuples that provide the manufacturer and card version; these are used to identify the card specification in the configuration @@ -213,11 +224,14 @@ card "XYZZY" "FAX/1.0" .Ed .Sh FILES -.Bl -tag -width /etc/pccard.conf -compact -.It Pa /etc/pccard.conf +.Bl -tag -width /etc/defaults/pccard.conf -compact +.It Pa /etc/defaults/pccard.conf The .Xr pccardd 8 -configuration file. +default configuration file. +.It Pa /etc/pccard.conf +The +user configuration file. .El .Sh SEE ALSO .Xr pccardd 8 |