- 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.

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