d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove all references to tickadj(8) from rc, rc.conf and rc.conf.5.

Browse Source 
Disable building tickadj(8) by removing util from SUBDIR in the xntpd
Makefile. Note that the sources are still there and tickadj can still
be built and installed by doing:

# cd /usr/src/usr.sbin/xntpd/util
# make all install

There are enough references to tickadj in e.g. the xntpd documentation
(not to mention the sysctl variables it uses etc.) that I don't feel
up to implementing the final solution right now.

Kinda-approved-by:	phk
This commit is contained in:
des 1998-10-08 18:47:30 +00:00
parent f20c820e31
commit 8aeb1f4ecc
4 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/rc
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $Id: rc,v 1.157 1998/09/16 22:42:56 brian Exp $
'#!/bin/sh
# $Id: rc,v 1.158 1998/09/30 14:44:57 cracauer Exp $
# From: @(#)rc 5.27 (Berkeley) 6/5/91
# System startup script run by init on autoboot
@ -191,10 +191,6 @@ if [ "X${syslogd_enable}" = X"YES" ]; then
rm -f /var/run/log
echo -n ' syslogd'; syslogd ${syslogd_flags}
fi
if [ "X${tickadj_enable}" = X"YES" ]; then
echo -n ' tickadj'; tickadj ${tickadj_flags--Aq}
fi
echo '.'
# enable dumpdev so that savecore can see it

4
etc/rc.conf
View File

@ -6,7 +6,7 @@
#
# All arguments must be in double or single quotes.
#
# $Id: rc.conf,v 1.59 1998/09/23 04:42:02 jkh Exp $
# $Id: rc.conf,v 1.60 1998/10/06 19:24:14 phk Exp $
##############################################################
### Important initial Boot-time options #####################
@ -83,8 +83,6 @@ ntpdate_flags="" # Flags to ntpdate (if enabled).
xntpd_enable="NO" # Run xntpd Network Time Protocol (or NO).
xntpd_program="xntpd" # path to xntpd, if you want a different one.
xntpd_flags="-p /var/run/xntpd.pid" # Flags to xntpd (if enabled).
tickadj_enable="NO" # Run tickadj (or NO).
tickadj_flags="-Aq" # Flags to tickadj (if enabled).
# Network Information Services (NIS) options: ###
nis_client_enable="NO" # We're an NIS client (or NO).

16
share/man/man5/rc.conf.5
View File

@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" $Id: rc.conf.5,v 1.22 1998/07/08 23:31:28 nectar Exp $
.\" $Id: rc.conf.5,v 1.23 1998/10/06 19:24:26 phk Exp $
.\"
.Dd April 26, 1997
.Dt RC.CONF 5
@ -407,20 +407,6 @@ is set to
these are the flags to pass to the
.Xr xntpd 8
daemon.
.It Ar tickadj_enable
(bool) If set to
.Ar YES
then run the
.Xr tickadj 8
command at system boot time.
.It Ar tickadj_flags
(str) If
.Ar tickadj_enable
is set to
.Ar YES ,
these are the flags to pass to the
.Xr tickadj 8
command.
.It Ar nis_client_enable
(bool) If set to
.Ar YES

4
usr.sbin/xntpd/Makefile
View File

@ -1,7 +1,7 @@
#
# Makefile for xntpd.
# $Id$
# $Id: Makefile,v 1.6 1997/02/22 16:14:13 peter Exp $
#
SUBDIR= lib parse xntpd xntpdc ntpq ntpdate ntptrace authstuff util
SUBDIR= lib parse xntpd xntpdc ntpq ntpdate ntptrace authstuff
.include <bsd.subdir.mk>