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.
This commit is contained in:
parent
329cac9cb7
commit
ece27d97a4
@ -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>
|
||||
|
@ -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
|
||||
#
|
||||
|
@ -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"
|
||||
|
@ -37,7 +37,6 @@ netstart - network startup script run from /etc/rc
|
||||
networks - see networks(5)
|
||||
newsyslog.conf - configuration for system log file rotator newsyslog(8)
|
||||
pam.conf - configuration file for pam(8)
|
||||
pccard.conf - configuration file for pccardd(8)
|
||||
pccard_ether - confiuration script for ethernet pccards (see pccardd(8))
|
||||
phones - phone number database for tip(1)
|
||||
printcap - configuration file for lpr(1)
|
||||
@ -65,3 +64,4 @@ skey.access - configuration file for S/Key (see skey.access(5))
|
||||
syslog.conf - configuration file for syslogd(8)
|
||||
ttys - defines port configuration for init(8)
|
||||
defaults/rc.conf - default system configuration info (see rc.conf(5))
|
||||
defaults/pccard.conf - default configuration file for pccardd(8)
|
||||
|
Loading…
Reference in New Issue
Block a user