Date: Wed, 1 Jun 2016 16:45:08 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r301137 - in head: etc etc/ppp usr.sbin/ppp Message-ID: <201606011645.u51Gj8RT036952@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Jun 1 16:45:08 2016 New Revision: 301137 URL: https://svnweb.freebsd.org/changeset/base/301137 Log: Revert r289096: Files listed in 'CONFS' are not properly included in new installations (missing from base.txz), for reasons I still do not fully understand. This reverts the change excluding /etc/ppp/ppp.conf from a new installation. /etc/dma/dma.conf is also affected, but requires a different solution, still being investigated. Reported by: Ben Woods Sponsored by: The FreeBSD Foundation Added: head/etc/ppp/ - copied from r289095, head/etc/ppp/ Deleted: head/usr.sbin/ppp/ppp.conf Modified: head/etc/Makefile head/usr.sbin/ppp/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Wed Jun 1 16:12:26 2016 (r301136) +++ head/etc/Makefile Wed Jun 1 16:45:08 2016 (r301137) @@ -305,6 +305,10 @@ 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 Modified: head/usr.sbin/ppp/Makefile ============================================================================== --- head/usr.sbin/ppp/Makefile Wed Jun 1 16:12:26 2016 (r301136) +++ head/usr.sbin/ppp/Makefile Wed Jun 1 16:45:08 2016 (r301137) @@ -21,9 +21,6 @@ PPP_NO_PAM= PPP_NO_RADIUS= PPP_NO_SUID= .endif -CONFS= ppp.conf -CONFSDIR= ${CONFDIR}/ppp -CONFSMODE= 600 .if ${MK_ATM} == "no" PPP_NO_ATM=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606011645.u51Gj8RT036952>