diff options
| author | bapt <bapt@FreeBSD.org> | 2015-10-09 23:57:07 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-10-09 23:57:07 +0000 |
| commit | bf3b00c72df48b3dd1c931f456e0939fd58b97fc (patch) | |
| tree | acb1d2067169888d19eb2d8f8ed7e6e6d99cd4f9 | |
| parent | 80f6a6685f4d0e6af4803f0c32df3f93dd677352 (diff) | |
| download | FreeBSD-src-bf3b00c72df48b3dd1c931f456e0939fd58b97fc.zip FreeBSD-src-bf3b00c72df48b3dd1c931f456e0939fd58b97fc.tar.gz | |
Move ppp.conf into the ppp sources
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/ppp/Makefile | 3 | ||||
| -rw-r--r-- | usr.sbin/ppp/ppp.conf (renamed from etc/ppp/ppp.conf) | 0 |
3 files changed, 3 insertions, 4 deletions
diff --git a/etc/Makefile b/etc/Makefile index ab17e1e..0112c61 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -291,10 +291,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_MAIL} != "no" cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${ETCMAIL} ${DESTDIR}/etc/mail diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index e0772af..6a3d8f2 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -21,6 +21,9 @@ PPP_NO_PAM= PPP_NO_RADIUS= PPP_NO_SUID= .endif +CONFS= ppp.conf +CONFSDIR= ${ETCDIR}/ppp +CONFSMODE= 600 .if ${MK_ATM} == "no" PPP_NO_ATM= diff --git a/etc/ppp/ppp.conf b/usr.sbin/ppp/ppp.conf index 2b63834..2b63834 100644 --- a/etc/ppp/ppp.conf +++ b/usr.sbin/ppp/ppp.conf |
