[systemd-devel] [PATCH] improve systemctl daemon-reexec and daemon-reload documentation

[Lennart Poettering]

On Wed, 17.06.15 11:22, Thomas Blume (Thomas.Blume at suse.com) wrote:

> The systemctl daemon-reexec and daemon-reload documentation
> in the manpage is a bit ambiguous. It suggests that daemon-reload reloads the
> configuration of the manager itself (e.g. the [Manager] section in
> /etc/systemd/system.conf). It should be pointed out that it only reloads the
> configuration for the manager clients and that for reloading the manager
> configuration, daemon-reexec must be used.

"clients"? I am not sure what that term is supposed to refer to?

The reason we say it's the "manager" configuration is because people
should distuingish "systemctl daemon-reload" from "systemctl reload"
where the latter just asks a service to reload its own configuration,
but systemd (aka "the manager") stays unaffected.

I think "systemctl daemon-reload" should probably reload system.conf,
too though, hence I'd like to avoid documenting this behaviour now,
but rather consider this a bug we should fix. Documenting behaviour
now and then changing it later is worse than simply leaving it vague
for now, and correcting it later. I will add that to the TODO list.

> From 198dbd4fdc4a4cccef24aa9fd97ceb328c87c52d Mon Sep 17 00:00:00 2001
> From: Thomas Blume <Thomas.Blume at suse.com>
> Date: Wed, 17 Jun 2015 11:03:52 +0200
> Subject: [PATCH] The systemctl daemon-reexec and daemon-reload documentation
>  in the manpage is a bit ambiguous. It suggests that daemon-reload reloads the
>  configuration of the manager itself (e.g. the [Manager] section in
>  /etc/systemd/system.conf). It should be pointed out that it only reloads the
>  configuration for the manager clients and that for reloading the manager
>  configuration, daemon-reexec must be used.
> 
> ---
>  man/systemctl.xml         | 8 ++++----
>  src/systemctl/systemctl.c | 2 +-
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/man/systemctl.xml b/man/systemctl.xml
> index 338c1d3..6c94255 100644
> --- a/man/systemctl.xml
> +++ b/man/systemctl.xml
> @@ -1367,7 +1367,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
>            <term><command>daemon-reload</command></term>
>  
>            <listitem>
> -            <para>Reload systemd manager configuration. This will
> +            <para>Reload systemd manager client configuration. This will
>              rerun all generators (see
>              <citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>),
>              reload all unit files, and recreate the entire dependency
> @@ -1385,9 +1385,9 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
>            <listitem>
>              <para>Reexecute the systemd manager. This will serialize the
>              manager state, reexecute the process and deserialize the
> -            state again. This command is of little use except for
> -            debugging and package upgrades. Sometimes, it might be
> -            helpful as a heavy-weight <command>daemon-reload</command>.
> +            state again. It updates the systemd manager configuration
> +            after changes in the system config file (/etc/systemd/system.conf).
> +            Sometimes, it might be helpful as a heavy-weight <command>daemon-reload</command>.
>              While the daemon is being reexecuted, all sockets systemd listening
>              on behalf of user configuration will stay accessible.
>              </para>
> diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
> index 41f7b9f..ce7c540 100644
> --- a/src/systemctl/systemctl.c
> +++ b/src/systemctl/systemctl.c
> @@ -6035,7 +6035,7 @@ static void systemctl_help(void) {
>                 "  unset-environment NAME...       Unset one or more environment variables\n"
>                 "  import-environment [NAME...]    Import all or some environment variables\n\n"
>                 "Manager Lifecycle Commands:\n"
> -               "  daemon-reload                   Reload systemd manager configuration\n"
> +               "  daemon-reload                   Reload systemd manager client configuration\n"
>                 "  daemon-reexec                   Reexecute systemd manager\n\n"
>                 "System Commands:\n"
>                 "  is-system-running               Check whether system is fully running\n"
> -- 
> 2.1.4
> 

> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel



Lennart

-- 
Lennart Poettering, Red Hat