diff options
| author | Mitsuru IWASAKI <iwasaki@FreeBSD.org> | 2000-04-15 11:02:49 +0000 |
|---|---|---|
| committer | Mitsuru IWASAKI <iwasaki@FreeBSD.org> | 2000-04-15 11:02:49 +0000 |
| commit | eac2e0d3f08d53bf96ee471f82dae944eecd5d08 (patch) | |
| tree | f0d8b7795a91961051a049217c6288abb9a0093a /etc | |
| parent | df2186b3302e5f27900a63e1bd984b7266fa5788 (diff) | |
| download | src-eac2e0d3f08d53bf96ee471f82dae944eecd5d08.tar.gz src-eac2e0d3f08d53bf96ee471f82dae944eecd5d08.zip | |
MFC: related changes on src/etc/defaults/pccard.conf.
src/etc/Makefile: 1.219 -> 1.220
src/etc/defaults/pccard.conf: N/A -> 1.98
src/etc/defaults/rc.conf: 1.57 -> 1.58
src/share/examples/etc/README.examples: 1.5 -> 1.6
Approved by: imp, jkh
Notes
Notes:
svn path=/stable/4/; revision=59254
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 3 | ||||
| -rw-r--r-- | etc/defaults/rc.conf | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/etc/Makefile b/etc/Makefile index a3bf7547df1b..1b2ff00f8522 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/rc.conf b/etc/defaults/rc.conf index d84bd1e141bc..992bd1dc6414 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" |