On Mon, Nov 29, 2010 at 20:10, Kay Sievers <[email protected]> wrote: > On Mon, Nov 29, 2010 at 18:26, Bill Nottingham <[email protected]> wrote: >> Ran Benita ([email protected]) said: >>> These tiny differences were confusing enough for the author of the >>> manpage, and I managed to get it wrong as well; >>> upon closer examination, I was perhaps a bit reckless... >>> The LSB page here >>> http://refspecs.linux-foundation.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html >>> says force-reload = reload-or-try-restart, which is the current >>> behavior. So systemctl.c should not change. >>> >>> The condrestart correction in the manpage is still applicable, >>> however. In the interest of complete clarity, here is my updated >>> suggestion: >> >> Looks OK to me. > > Ran, your patch is mangled and doesn't apply. Care to resend it, or is > the part unchanged since the original submit? > > Kay >
Grr, I apologize for the noise. My ISP decided to block the smtp ports so I'm forced to go through the web interface, which does some autowrapping apparently :( Anyway, here it is again, attached.
From 0e5c02ff6f97f9186211f6004a9233c282db6625 Mon Sep 17 00:00:00 2001 From: Ran Benita <[email protected]> Date: Tue, 30 Nov 2010 19:05:13 +0200 Subject: [PATCH] man: systemctl - clarify condrestart, force-reload --- man/systemctl.xml | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/man/systemctl.xml b/man/systemctl.xml index 7bb8458..6b05e95 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -416,21 +416,31 @@ units specified on the command line. If the units are not running yet the operation will - fail.</para></listitem> + fail. Note that for compatibility + with Red Hat init scripts + <command>condrestart</command> is + equivalent to this command.</para></listitem> </varlistentry> <varlistentry> <term><command>reload-or-restart [NAME...]</command></term> + + <listitem><para>Reload one or more + units if they support it. If not, + restart them instead. If the units + are not running yet they will be + started.</para></listitem> + </varlistentry> + <varlistentry> <term><command>reload-or-try-restart [NAME...]</command></term> <listitem><para>Reload one or more units if they support it. If not, - restart them instead. Note that for - compatibility with SysV and Red Hat - init scripts - <command>force-reload</command> and - <command>condrestart</command> may be - used as equivalent commands to - <command>reload-or-try-restart</command>.</para></listitem> + restart them instead. If the units + are not running yet the operation + will fail. Note that for + compatibility with SysV init scripts + <command>force-reload</command> is + equivalent to this command.</para></listitem> </varlistentry> <varlistentry> <term><command>isolate [NAME]</command></term> -- 1.7.3.2
_______________________________________________ systemd-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/systemd-devel
