diff options
| author | gjb <gjb@FreeBSD.org> | 2016-06-01 20:44:28 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-06-01 20:44:28 +0000 |
| commit | fe5676baea3c38ee19776983fdc1cf22c4a7d928 (patch) | |
| tree | d5de5230db3fad21fe53ad39c087cff6f8737235 /etc | |
| parent | ca9df9fc9c6b915fb06e4d21543dfe2af4d7d1d8 (diff) | |
| download | FreeBSD-src-fe5676baea3c38ee19776983fdc1cf22c4a7d928.zip FreeBSD-src-fe5676baea3c38ee19776983fdc1cf22c4a7d928.tar.gz | |
Revert r301137 and r301163, and implement a correct fix
for the CONFS issue with dma.conf and ppp.conf.
Thank you very much to Bryan Drewery for looking into the
problem and providing this fix.
Pointyhat: gjb
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 8 | ||||
| -rw-r--r-- | etc/ppp/ppp.conf | 37 |
2 files changed, 0 insertions, 45 deletions
diff --git a/etc/Makefile b/etc/Makefile index 43e6f60..94c4473 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -305,14 +305,6 @@ distribution: .endif cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree -.if ${MK_PPP} != "no" - cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ - ${PPPCNF} ${DESTDIR}/etc/ppp -.endif -.if ${MK_DMAGENT} != "no" - cd ${.CURDIR}/../libexec/dma/dmagent; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - dma.conf ${DESTDIR}/etc/dma -.endif .if ${MK_MAIL} != "no" cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${ETCMAIL} ${DESTDIR}/etc/mail diff --git a/etc/ppp/ppp.conf b/etc/ppp/ppp.conf deleted file mode 100644 index 2b63834..0000000 --- a/etc/ppp/ppp.conf +++ /dev/null @@ -1,37 +0,0 @@ -################################################################# -# PPP Sample Configuration File -# Originally written by Toshiharu OHNO -# Simplified 5/14/1999 by wself@cdrom.com -# -# See /usr/share/examples/ppp/ for some examples -# -# $FreeBSD$ -################################################################# - -default: - set log Phase Chat LCP IPCP CCP tun command - ident user-ppp VERSION - - # Ensure that "device" references the correct serial port - # for your modem. (cuau0 = COM1, cuau1 = COM2) - # - set device /dev/cuau1 - - set speed 115200 - set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \ - \"\" AT OK-AT-OK ATE1Q0 OK \\dATDT\\T TIMEOUT 40 CONNECT" - set timeout 180 # 3 minute idle timer (the default) - enable dns # request DNS info (for resolv.conf) - -papchap: - # - # edit the next three lines and replace the items in caps with - # the values which have been assigned by your ISP. - # - - set phone PHONE_NUM - set authname USERNAME - set authkey PASSWORD - - set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.0 0.0.0.0 - add default HISADDR # Add a (sticky) default route |
