MFhead @ r289100

5 files changed, 1 insertions, 117 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 053a407..0112c61 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -239,9 +239,6 @@ distribution:
 .endif
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
-.if ${MK_DMAGENT} != "no"
-	${_+_}cd ${.CURDIR}/dma; ${MAKE} install
-.endif
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
 .if ${MK_PKGBOOTSTRAP} != "no"
@@ -294,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/etc/dma/Makefile b/etc/dma/Makefile
deleted file mode 100644
index 0544f6f..0000000
--- a/etc/dma/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-FILES=	dma.conf
-
-NO_OBJ=
-FILESDIR=	/etc/dma
-
-.include <bsd.prog.mk>
diff --git a/etc/dma/dma.conf b/etc/dma/dma.conf
deleted file mode 100644
index 2f50a4e..0000000
--- a/etc/dma/dma.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-# $FreeBSD$
-#
-# Your smarthost (also called relayhost).  Leave blank if you don't want
-# smarthost support.
-#SMARTHOST
-
-# Use this SMTP port.  Most users will be fine with the default (25)
-#PORT 25
-
-# Path to your alias file.  Just stay with the default.
-#ALIASES /etc/aliases
-
-# Path to your spooldir.  Just stay with the default.
-#SPOOLDIR /var/spool/dma
-
-# SMTP authentication
-#AUTHPATH /etc/dma/auth.conf
-
-# Uncomment if yout want TLS/SSL support
-#SECURETRANSFER
-
-# Uncomment if you want STARTTLS support (only used in combination with
-# SECURETRANSFER)
-#STARTTLS
-
-# Uncomment if you have specified STARTTLS above and it should be allowed
-# to fail ("opportunistic TLS", use an encrypted connection when available
-# but allow an unencrypted one to servers that do not support it)
-#OPPORTUNISTIC_TLS
-
-# Path to your local SSL certificate
-#CERTFILE
-
-# If you want to use plain text SMTP login without using encryption, change
-# the SECURE entry below to INSECURE.  Otherwise plain login will only work
-# over a secure connection.  Use this option with caution.
-#SECURE
-
-# Uncomment if you want to defer your mails.  This is useful if you are
-# behind a dialup line.  You have to submit your mails manually with dma -q
-#DEFER
-
-# Uncomment if you want the bounce message to include the complete original
-# message, not just the headers.
-#FULLBOUNCE
-
-# The internet hostname dma uses to identify the host.
-# If not set or empty, the result of gethostname(2) is used.
-# If MAILNAME is an absolute path to a file, the first line of this file
-# will be used as the hostname.
-#MAILNAME mail.example.net
-
-# Masquerade envelope from addresses with this address/hostname.
-# Use this if mails are not accepted by destination mail servers because
-# your sender domain is invalid.
-# By default, MASQUERADE is not set.
-# Format: MASQUERADE [user@][host]
-# Examples:
-# MASQUERADE john@  on host "hamlet" will send all mails as john@hamlet
-# MASQUERADE percolator  will send mails as $username@percolator, e.g. fish@percolator
-# MASQUERADE herb@ert  will send all mails as herb@ert
-
-# Directly forward the mail to the SMARTHOST bypassing aliases and local delivery
-#NULLCLIENT
diff --git a/etc/periodic/daily/480.status-ntpd b/etc/periodic/daily/480.status-ntpd
index 1eb8011..1ff5cc5 100755
--- a/etc/periodic/daily/480.status-ntpd
+++ b/etc/periodic/daily/480.status-ntpd
@@ -18,7 +18,7 @@ case "$daily_status_ntpd_enable" in
 	echo ""
 	echo "NTP status:"
 
-	synchronized=$(ntpq -p | tee /dev/stderr | grep '^\*')
+	synchronized=$(ntpq -pn | tee /dev/stderr | grep '^\*')
 	if [ -z "$synchronized" ]; then
 		rc=1
 	fi
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