From: Tomek Mrugalski Date: Thu, 18 Jul 2019 10:51:02 +0000 (+0200) Subject: [#644,!370] Manual apply of 85c5b01d694c995f6e93c0454ee6e0031fc75d83 X-Git-Tag: Kea-1.6.1~10^2~71 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6aca000be3c7eef5380d2e96fcedc1c07e3da194;p=thirdparty%2Fkea.git [#644,!370] Manual apply of 85c5b01d694c995f6e93c0454ee6e0031fc75d83 --- diff --git a/doc/sphinx/arm/ddns.rst b/doc/sphinx/arm/ddns.rst index c3399a6791..5e496ce4cf 100644 --- a/doc/sphinx/arm/ddns.rst +++ b/doc/sphinx/arm/ddns.rst @@ -141,10 +141,10 @@ Upon startup, the module will load its configuration and begin listening for NCRs based on that configuration. During startup, the server will attempt to create a PID file of the form: -[**localstatedir**]/[**conf name**].kea-dhcp-ddns.pid where: +[**runstatedir**]/[**conf name**].kea-dhcp-ddns.pid where: -- ``localstatedir`` - is the value as passed into the build configure - script; it defaults to "/usr/local/var". Note that this value may be +- ``runstatedir`` - is the value as passed into the build configure + script; it defaults to "/usr/local/var/run". Note that this value may be overridden at runtime by setting the environment variable KEA_PIDFILE_DIR. This is intended primarily for testing purposes. diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst index b91c99b2a6..949b1e71e2 100644 --- a/doc/sphinx/arm/dhcp4-srv.rst +++ b/doc/sphinx/arm/dhcp4-srv.rst @@ -58,10 +58,10 @@ configuration file. Since the DHCPv4 server opens privileged ports, it requires root access. This daemon must be run as root. During startup, the server will attempt to create a PID file of the -form: [localstatedir]/[conf name].kea-dhcp4.pid where: +form: [runstatedir]/[conf name].kea-dhcp4.pid where: -- ``localstatedir``: The value as passed into the build configure - script; it defaults to "/usr/local/var". Note that this value may be +- ``runstatedir``: The value as passed into the build configure + script; it defaults to "/usr/local/var/run". Note that this value may be overridden at runtime by setting the environment variable KEA_PIDFILE_DIR, although this is intended primarily for testing purposes. diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst index b9d3472b04..1a2cb2f7d2 100644 --- a/doc/sphinx/arm/dhcp6-srv.rst +++ b/doc/sphinx/arm/dhcp6-srv.rst @@ -58,10 +58,10 @@ configuration file. Since the DHCPv6 server opens privileged ports, it requires root access. This daemon must be run as root. During startup, the server will attempt to create a PID file of the -form: [**localstatedir**]/[**conf name**].kea-dhcp6.pid where: +form: [**runstatedir**]/[**conf name**].kea-dhcp6.pid where: -- ``localstatedir``: The value as passed into the build configure - script; it defaults to "/usr/local/var". Note that this value may be +- ``runstatedir``: The value as passed into the build configure + script; it defaults to "/usr/local/var/run". Note that this value may be overridden at runtime by setting the environment variable KEA_PIDFILE_DIR, although this is intended primarily for testing purposes.