Author: gjb
Date: Wed Jun 1 20:44:28 2016
New Revision: 301166
URL: https://svnweb.freebsd.org/changeset/base/301166
Log:
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
Added:
head/usr.sbin/ppp/ppp.conf
- copied unchanged from r301136, head/usr.sbin/ppp/ppp.conf
Deleted:
head/etc/ppp/
Modified:
head/etc/Makefile
head/libexec/dma/dmagent/Makefile
head/share/mk/bsd.subdir.mk
head/usr.sbin/ppp/Makefile
Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile Wed Jun 1 20:39:00 2016 (r301165)
+++ head/etc/Makefile Wed Jun 1 20:44:28 2016 (r301166)
@@ -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
Modified: head/libexec/dma/dmagent/Makefile
==============================================================================
--- head/libexec/dma/dmagent/Makefile Wed Jun 1 20:39:00 2016
(r301165)
+++ head/libexec/dma/dmagent/Makefile Wed Jun 1 20:44:28 2016
(r301166)
@@ -18,6 +18,8 @@ SRCS= aliases_parse.y \
spool.c \
util.c
MAN8= dma.8
+CONFS= dma.conf
+CONFSDIR= ${CONFDIR}/dma
YFLAGS+= -i
CLEANFILES= aliases_parse.i
FILES= mailer.conf
Modified: head/share/mk/bsd.subdir.mk
==============================================================================
--- head/share/mk/bsd.subdir.mk Wed Jun 1 20:39:00 2016 (r301165)
+++ head/share/mk/bsd.subdir.mk Wed Jun 1 20:44:28 2016 (r301166)
@@ -72,10 +72,9 @@ DISTRIBUTION?= base
distribute: .MAKE
.for dist in ${DISTRIBUTION}
${_+_}cd ${.CURDIR}; \
- ${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies
+ ${MAKE} install installconfig -DNO_SUBDIR
DESTDIR=${DISTDIR}/${dist} SHARED=copies
.endfor
.endif
-
# Convenience targets to run 'build${target}' and 'install${target}' when
# calling 'make ${target}'.
.for __target in files includes
Modified: head/usr.sbin/ppp/Makefile
==============================================================================
--- head/usr.sbin/ppp/Makefile Wed Jun 1 20:39:00 2016 (r301165)
+++ head/usr.sbin/ppp/Makefile Wed Jun 1 20:44:28 2016 (r301166)
@@ -21,6 +21,9 @@ 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=
Copied: head/usr.sbin/ppp/ppp.conf (from r301136, head/usr.sbin/ppp/ppp.conf)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/ppp/ppp.conf Wed Jun 1 20:44:28 2016 (r301166, copy
of r301136, head/usr.sbin/ppp/ppp.conf)
@@ -0,0 +1,37 @@
+#################################################################
+# PPP Sample Configuration File
+# Originally written by Toshiharu OHNO
+# Simplified 5/14/1999 by ws...@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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
