From 8bc48af6307bac64a1b0655a4e51c1d3d1da085a Mon Sep 17 00:00:00 2001 From: Bryan Christianson Date: Thu, 4 Aug 2016 20:08:07 +1200 Subject: [PATCH] rename 'Mac OS X' to 'macOS' From the the release of macOS Sierra (Version 10.12) the Macintosh operating system is called 'macOS' --- README | 4 ++-- configure | 2 +- contrib/bryan_christianson_1/README.txt | 8 ++++---- doc/chrony.conf.adoc | 10 +++++----- doc/chronyd.adoc | 4 ++-- doc/faq.adoc | 4 ++-- sys_macosx.c | 2 +- sys_macosx.h | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README b/README index 9c59f3a..005cba1 100644 --- a/README +++ b/README @@ -27,7 +27,7 @@ operating parameters whilst it is running. What will chrony run on? ======================== -The software is known to work on Linux, FreeBSD, NetBSD, Mac OS X and +The software is known to work on Linux, FreeBSD, NetBSD, macOS and Solaris. Closely related systems may work too. Any other system will likely require a porting exercise. You would need to start from one of the existing system-specific drivers and look into the quirks of @@ -139,7 +139,7 @@ Erik Bryer Entries in contrib directory Bryan Christianson - Support for Mac OS X + Support for macOS Support for privilege separation Entries in contrib directory diff --git a/configure b/configure index 249b134..5e9b7f4 100755 --- a/configure +++ b/configure @@ -402,7 +402,7 @@ case $OPERATINGSYSTEM in add_def FEAT_PRIVDROP priv_ops="ADJUSTTIME SETTIME BINDSOCKET" fi - echo "Configuring for MacOS X (" $SYSTEM "MacOS X version" $VERSION ")" + echo "Configuring for macOS (" $SYSTEM "macOS version" $VERSION ")" ;; SunOS) EXTRA_OBJECTS="sys_generic.o sys_solaris.o sys_timex.o" diff --git a/contrib/bryan_christianson_1/README.txt b/contrib/bryan_christianson_1/README.txt index 0a221aa..3a0a2ef 100644 --- a/contrib/bryan_christianson_1/README.txt +++ b/contrib/bryan_christianson_1/README.txt @@ -1,16 +1,16 @@ -Notes for installing chrony on MacOS X +Notes for installing chrony on macOS Author: Bryan Christianson (bryan@whatroute.net) ------------------------------------------------ These files are for those admins/users who would prefer to install chrony from the source distribution and are intended as guidelines rather than being definitive. They can be edited with a plain text editor, such as -vi, emacs or your favourite IDE (xcode) +vi, emacs or your favourite IDE (Xcode) It is assumed you are comfortable with installing software from the terminal command line and know how to use sudo to acquire root access. -If you are not familiar with the MacOS X command line then +If you are not familiar with the macOS command line then please consider using ChronyControl from http://whatroute.net/chronycontrol.html ChronyControl provides a gui wrapper for installing these files and sets the @@ -72,7 +72,7 @@ Installing the support files 1. chronylogrotate.sh This is a simple shell script that deletes old log files. Unfortunately because -of the need to run chronyc, the standard MacOS X logrotation does not work with +of the need to run chronyc, the standard macOS logrotation does not work with chrony logs. This script runs on a daily basis under control of launchd and should be diff --git a/doc/chrony.conf.adoc b/doc/chrony.conf.adoc index 33fbfca..995c1c7 100644 --- a/doc/chrony.conf.adoc +++ b/doc/chrony.conf.adoc @@ -1428,7 +1428,7 @@ cannot be used with the <> directive. + On Linux, the RTC copy is performed by the kernel every 11 minutes. + -On Mac OS X, <> will perform the RTC copy every 60 minutes +On macOS, <> will perform the RTC copy every 60 minutes when the system clock is in a synchronised state. + On other systems this directive does nothing. @@ -1786,8 +1786,8 @@ pidfile /run/chronyd.pid [[sched_priority]]*sched_priority* _priority_:: On Linux, the *sched_priority* directive will select the SCHED_FIFO real-time -scheduler at the specified priority (which must be between 0 and 100). On Mac -OS X, this option must have either a value of 0 (the default) to disable the +scheduler at the specified priority (which must be between 0 and 100). On +macOS, this option must have either a value of 0 (the default) to disable the thread time constraint policy or 1 for the policy to be enabled. Other systems do not support this option. + @@ -1802,7 +1802,7 @@ wait for the scheduler to get around to running it. You should not use this unless you really need it. The *sched_setscheduler(2)* man page has more details. + -On Mac OS X, this directive uses the *thread_policy_set()* kernel call to +On macOS, this directive uses the *thread_policy_set()* kernel call to specify real-time scheduling. As noted for Linux, you should not use this directive unless you really need it. @@ -1811,7 +1811,7 @@ The *user* directive sets the name of the system user to which *chronyd* will switch after start in order to drop root privileges. + On Linux, *chronyd* needs to be compiled with support for the *libcap* library. -On Mac OS X, FreeBSD, NetBSD and Solaris *chronyd* forks into two processes. +On macOS, FreeBSD, NetBSD and Solaris *chronyd* forks into two processes. The child process retains root privileges, but can only perform a very limited range of privileged system calls on behalf of the parent. + diff --git a/doc/chronyd.adoc b/doc/chronyd.adoc index d54d585..c4001c2 100644 --- a/doc/chronyd.adoc +++ b/doc/chronyd.adoc @@ -115,7 +115,7 @@ after start in order to drop root privileges. It overrides the <> directive (default _@DEFAULT_USER@_). + On Linux, *chronyd* needs to be compiled with support for the *libcap* library. -On Mac OS X, FreeBSD, NetBSD and Solaris *chronyd* forks into two processes. +On macOS, FreeBSD, NetBSD and Solaris *chronyd* forks into two processes. The child process retains root privileges, but can only perform a very limited range of privileged system calls on behalf of the parent. @@ -134,7 +134,7 @@ killed even in normal operation. *-P* _priority_:: On Linux, this option will select the SCHED_FIFO real-time scheduler at the -specified priority (which must be between 0 and 100). On Mac OS X, this option +specified priority (which must be between 0 and 100). On macOS, this option must have either a value of 0 (the default) to disable the thread time constraint policy or 1 for the policy to be enabled. Other systems do not support this option. diff --git a/doc/faq.adoc b/doc/faq.adoc index 01076ef..da9a94f 100644 --- a/doc/faq.adoc +++ b/doc/faq.adoc @@ -61,8 +61,8 @@ that. In order to keep the real-time clock (RTC) close to the true time, so the system time is reasonably close to the true time when it's initialized on the next boot from the RTC, the `rtcsync` directive enables a mode in which the -system time is periodically copied to the RTC. It is supported on Linux and Mac -OS X. +system time is periodically copied to the RTC. It is supported on Linux and +macOS. If you want to use public NTP servers from the http://www.pool.ntp.org/[pool.ntp.org] project, the minimal _chrony.conf_ file diff --git a/sys_macosx.c b/sys_macosx.c index 46e439e..b6d8e80 100644 --- a/sys_macosx.c +++ b/sys_macosx.c @@ -23,7 +23,7 @@ ======================================================================= - Driver file for the MacOS X operating system. + Driver file for the macOS operating system. */ diff --git a/sys_macosx.h b/sys_macosx.h index b9114ff..5555616 100644 --- a/sys_macosx.h +++ b/sys_macosx.h @@ -23,7 +23,7 @@ ======================================================================= - Header file for MacOS X driver + Header file for macOS driver */