configure: rename SOCKDIR to RUNDIR

This commit is contained in:
Miroslav Lichvar 2016-12-02 13:25:34 +01:00
parent 53b661b59d
commit b95c2a3f78
4 changed files with 15 additions and 15 deletions

16
configure vendored
View file

@ -120,7 +120,7 @@ Fine tuning of the installation directories:
--mandir=DIR man documentation [DATAROOTDIR/man] --mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root [DATAROOTDIR/doc/chrony] --docdir=DIR documentation root [DATAROOTDIR/doc/chrony]
--localstatedir=DIR modifiable single-machine data [/var] --localstatedir=DIR modifiable single-machine data [/var]
--chronysockdir=DIR location for chrony sockets [LOCALSTATEDIR/run/chrony] --chronyrundir=DIR location for chrony sockets [LOCALSTATEDIR/run/chrony]
--chronyvardir=DIR location for chrony data [LOCALSTATEDIR/lib/chrony] --chronyvardir=DIR location for chrony data [LOCALSTATEDIR/lib/chrony]
Overriding system detection when cross-compiling: Overriding system detection when cross-compiling:
@ -281,8 +281,8 @@ do
--localstatedir=* ) --localstatedir=* )
SETLOCALSTATEDIR=`echo $option | sed -e 's/^.*=//;'` SETLOCALSTATEDIR=`echo $option | sed -e 's/^.*=//;'`
;; ;;
--chronysockdir=* ) --chronyrundir=* | --chronysockdir=* )
SETCHRONYSOCKDIR=`echo $option | sed -e 's/^.*=//;'` SETCHRONYRUNDIR=`echo $option | sed -e 's/^.*=//;'`
;; ;;
--chronyvardir=* ) --chronyvardir=* )
SETCHRONYVARDIR=`echo $option | sed -e 's/^.*=//;'` SETCHRONYVARDIR=`echo $option | sed -e 's/^.*=//;'`
@ -875,9 +875,9 @@ if [ "x$SETLOCALSTATEDIR" != "x" ]; then
LOCALSTATEDIR=$SETLOCALSTATEDIR LOCALSTATEDIR=$SETLOCALSTATEDIR
fi fi
CHRONYSOCKDIR=${LOCALSTATEDIR}/run/chrony CHRONYRUNDIR=${LOCALSTATEDIR}/run/chrony
if [ "x$SETCHRONYSOCKDIR" != "x" ]; then if [ "x$SETCHRONYRUNDIR" != "x" ]; then
CHRONYSOCKDIR=$SETCHRONYSOCKDIR CHRONYRUNDIR=$SETCHRONYRUNDIR
fi fi
CHRONYVARDIR=${LOCALSTATEDIR}/lib/chrony CHRONYVARDIR=${LOCALSTATEDIR}/lib/chrony
@ -890,7 +890,7 @@ add_def DEFAULT_HWCLOCK_FILE "\"$default_hwclockfile\""
add_def DEFAULT_PID_FILE "\"$default_pidfile\"" add_def DEFAULT_PID_FILE "\"$default_pidfile\""
add_def DEFAULT_RTC_DEVICE "\"$default_rtcdevice\"" add_def DEFAULT_RTC_DEVICE "\"$default_rtcdevice\""
add_def DEFAULT_USER "\"$default_user\"" add_def DEFAULT_USER "\"$default_user\""
add_def DEFAULT_COMMAND_SOCKET "\"$CHRONYSOCKDIR/chronyd.sock\"" add_def DEFAULT_COMMAND_SOCKET "\"$CHRONYRUNDIR/chronyd.sock\""
add_def MAIL_PROGRAM "\"$mail_program\"" add_def MAIL_PROGRAM "\"$mail_program\""
common_features="`get_features IPV6 DEBUG`" common_features="`get_features IPV6 DEBUG`"
@ -928,7 +928,7 @@ do
s%@DOCDIR@%${DOCDIR}%;\ s%@DOCDIR@%${DOCDIR}%;\
s%@MANDIR@%${MANDIR}%;\ s%@MANDIR@%${MANDIR}%;\
s%@LOCALSTATEDIR@%${LOCALSTATEDIR}%;\ s%@LOCALSTATEDIR@%${LOCALSTATEDIR}%;\
s%@CHRONYSOCKDIR@%${CHRONYSOCKDIR}%;\ s%@CHRONYRUNDIR@%${CHRONYRUNDIR}%;\
s%@CHRONYVARDIR@%${CHRONYVARDIR}%;\ s%@CHRONYVARDIR@%${CHRONYVARDIR}%;\
s%@DEFAULT_HWCLOCK_FILE@%${default_hwclockfile}%;\ s%@DEFAULT_HWCLOCK_FILE@%${default_hwclockfile}%;\
s%@DEFAULT_PID_FILE@%${default_pidfile}%;\ s%@DEFAULT_PID_FILE@%${default_pidfile}%;\

View file

@ -13,7 +13,7 @@ BINDIR = @BINDIR@
SBINDIR = @SBINDIR@ SBINDIR = @SBINDIR@
MANDIR = @MANDIR@ MANDIR = @MANDIR@
DOCDIR = @DOCDIR@ DOCDIR = @DOCDIR@
CHRONYSOCKDIR = @CHRONYSOCKDIR@ CHRONYRUNDIR = @CHRONYRUNDIR@
CHRONYVARDIR = @CHRONYVARDIR@ CHRONYVARDIR = @CHRONYVARDIR@
CHRONY_VERSION = @CHRONY_VERSION@ CHRONY_VERSION = @CHRONY_VERSION@
DEFAULT_USER = @DEFAULT_USER@ DEFAULT_USER = @DEFAULT_USER@
@ -29,7 +29,7 @@ SED_COMMANDS = "s%\@SYSCONFDIR\@%$(SYSCONFDIR)%g;\
s%\@DEFAULT_PID_FILE\@%$(DEFAULT_PID_FILE)%g;\ s%\@DEFAULT_PID_FILE\@%$(DEFAULT_PID_FILE)%g;\
s%\@DEFAULT_RTC_DEVICE\@%$(DEFAULT_RTC_DEVICE)%g;\ s%\@DEFAULT_RTC_DEVICE\@%$(DEFAULT_RTC_DEVICE)%g;\
s%\@DEFAULT_USER\@%$(DEFAULT_USER)%g;\ s%\@DEFAULT_USER\@%$(DEFAULT_USER)%g;\
s%\@CHRONYSOCKDIR\@%$(CHRONYSOCKDIR)%g;\ s%\@CHRONYRUNDIR\@%$(CHRONYRUNDIR)%g;\
s%\@CHRONYVARDIR\@%$(CHRONYVARDIR)%g;" s%\@CHRONYVARDIR\@%$(CHRONYVARDIR)%g;"
man: $(MAN_FILES) $(MAN_IN_FILES) man: $(MAN_FILES) $(MAN_IN_FILES)

View file

@ -545,11 +545,11 @@ saved.
An example of the directive is: An example of the directive is:
+ +
---- ----
dumpdir @CHRONYSOCKDIR@ dumpdir @CHRONYRUNDIR@
---- ----
+ +
A source whose IP address is _1.2.3.4_ would have its measurement history saved A source whose IP address is _1.2.3.4_ would have its measurement history saved
in the file _@CHRONYSOCKDIR@/1.2.3.4.dat_. History of reference clocks is saved in the file _@CHRONYRUNDIR@/1.2.3.4.dat_. History of reference clocks is saved
to files named by their reference ID in form of _refid:XXXXXXXX.dat_. to files named by their reference ID in form of _refid:XXXXXXXX.dat_.
[[dumponexit]]*dumponexit*:: [[dumponexit]]*dumponexit*::
@ -1314,7 +1314,7 @@ This directive can also change the path of the Unix domain command socket,
which is used by *chronyc* to send configuration commands. The socket must be which is used by *chronyc* to send configuration commands. The socket must be
in a directory that is accessible only by the root or _chrony_ user. The in a directory that is accessible only by the root or _chrony_ user. The
directory will be created on start if it does not exist. The compiled-in default directory will be created on start if it does not exist. The compiled-in default
path of the socket is _@CHRONYSOCKDIR@/chronyd.sock_. The socket can be path of the socket is _@CHRONYRUNDIR@/chronyd.sock_. The socket can be
disabled by setting the path to _/_. disabled by setting the path to _/_.
+ +
By default, *chronyd* binds to the loopback interface (with addresses By default, *chronyd* binds to the loopback interface (with addresses
@ -2218,7 +2218,7 @@ rtcsync
allow allow
ratelimit interval 2 burst 10 ratelimit interval 2 burst 10
driftfile @CHRONYVARDIR@/drift driftfile @CHRONYVARDIR@/drift
dumpdir @CHRONYSOCKDIR@ dumpdir @CHRONYRUNDIR@
dumponexit dumponexit
---- ----

View file

@ -44,7 +44,7 @@ There are two ways *chronyc* can access *chronyd*. One is the Internet
Protocol (IPv4 or IPv6) and the other is a Unix domain socket, which is Protocol (IPv4 or IPv6) and the other is a Unix domain socket, which is
accessible locally by the root or _chrony_ user. By default, *chronyc* first accessible locally by the root or _chrony_ user. By default, *chronyc* first
tries to connect to the Unix domain socket. The compiled-in default path is tries to connect to the Unix domain socket. The compiled-in default path is
_@CHRONYSOCKDIR@/chronyd.sock_. If that fails (e.g. because *chronyc* is _@CHRONYRUNDIR@/chronyd.sock_. If that fails (e.g. because *chronyc* is
running under a non-root user), it will try to connect to 127.0.0.1 and then running under a non-root user), it will try to connect to 127.0.0.1 and then
::1. ::1.