diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2000-04-03 19:24:25 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2000-04-03 19:24:25 +0000 |
| commit | 6c940a99c27f5eba7cddc3239407e7032fcd509c (patch) | |
| tree | 255b54402bef2a9e47e8cad979f03a5da1400e9a /etc | |
| parent | a26d62cb052a78816c584f2169fbff734cfdc080 (diff) | |
| download | FreeBSD-src-6c940a99c27f5eba7cddc3239407e7032fcd509c.zip FreeBSD-src-6c940a99c27f5eba7cddc3239407e7032fcd509c.tar.gz | |
Enable etc/defaults/pccard.conf which is default configuration file
for pccardd.
Please install /etc/defaults/pccard.conf and update /etc/defaults/rc.conf
as well.
Note that old pccard.conf.sample still remains for while but
no longer to be maintained.
Reviewed by: imp, -mobile ML and nomads ML in Japan.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 3 | ||||
| -rw-r--r-- | etc/defaults/pccard.conf | 6 | ||||
| -rw-r--r-- | etc/defaults/rc.conf | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/etc/Makefile b/etc/Makefile index a3bf754..1b2ff00 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -58,6 +58,7 @@ distribution: ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 ${BIN2} ${DESTDIR}/etc; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 defaults/rc.conf ${DESTDIR}/etc/defaults/; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 defaults/make.conf ${DESTDIR}/etc/defaults/; \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 defaults/pccard.conf ${DESTDIR}/etc/defaults/; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ ${DESTDIR}/var/log/cron; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 \ @@ -165,6 +166,8 @@ etc-examples: ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 defaults/rc.conf \ ${DESTDIR}/usr/share/examples/etc/defaults; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 defaults/make.conf \ + ${DESTDIR}/usr/share/examples/etc/defaults; \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 defaults/pccard.conf \ ${DESTDIR}/usr/share/examples/etc/defaults) .include <bsd.prog.mk> diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf index b56bccc..37db89b 100644 --- a/etc/defaults/pccard.conf +++ b/etc/defaults/pccard.conf @@ -1,4 +1,4 @@ -# Sample PCCARD configuration file +# Default PCCARD configuration file # # Removing all IRQ conflicts from this file can't be done because of some # IRQ-selfish PC-cards. So if you want to use some of these cards in @@ -21,6 +21,10 @@ irq 3 5 10 11 13 15 # Available memory slots memory 0xd4000 96k +# Include user configration file +# This allow you to override or add configurations. +include /etc/pccard.conf + # # PLEASE KEEP THIS FILE IN ORDER # diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index ec54d39..dd8a03b 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -29,7 +29,7 @@ pccard_mem="DEFAULT" # If pccard_enable=YES, this is card memory address. pccard_beep="1" # pccard beep type. pccard_ifconfig="NO" # Specialized pccard ethernet configuration (or NO). pccardd_flags="" # Additional flags for pccardd. -pccard_conf="/etc/pccard.conf.sample" # pccardd(8) config file +pccard_conf="/etc/defaults/pccard.conf" # pccardd(8) config file local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. local_periodic="/usr/local/etc/periodic /usr/X11R6/etc/periodic" # periodic script dirs rc_conf_files="/etc/rc.conf /etc/rc.conf.local" |
