On Fri, Nov 26, 2010 at 23:56, Ran Benita <[email protected]> wrote:
> The manpage says condrestart is equivalent to reload-or-try-restart, but
> the code and the sysvinitscripts file from the initscripts package says
> it is actually the same as try-restart.
>
> Further, the code and manpage say that force-reload is equivalent to
> reload-or-try-restart, but several legacy init scripts and the Debian
> Policy Manual (9.3.2), not to mention the name itself, suggest that it
> should be the same as the reload-or-restart command.
Bill, care to check the changes below if they apply to Fedora?
> There are also some spelling corrections.
I've committed all the spelling fixes. The remaining part is below,
which should be checked by Bill.
Thanks,
Kay
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 7bb8458..0286e98 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -416,7 +416,11 @@
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
+ SysV and Red Hat init scripts
+ <command>condrestart</command> may be
+ used as an equivalent command to
+
<command>try-restart</command>.</para></listitem>
</varlistentry>
<varlistentry>
<term><command>reload-or-restart
[NAME...]</command></term>
@@ -427,10 +431,9 @@
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>
+ <command>force-reload</command> may be
+ used as an equivalent command to
+
<command>reload-or-restart</command>.</para></listitem>
</varlistentry>
<varlistentry>
<term><command>isolate [NAME]</command></term>
diff --git a/src/systemctl-bash-completion.sh b/src/systemctl-bash-completion.sh
index 3e3380c..a54fa38 100644
--- a/src/systemctl-bash-completion.sh
+++ b/src/systemctl-bash-completion.sh
@@ -79,10 +79,10 @@ _systemctl () {
local -A VERBS=(
[ALL_UNITS]='enable disable is-active is-enabled status show'
[FAILED_UNITS]='reset-failed'
- [STARTABLE_UNITS]='start restart reload-or-restart'
+ [STARTABLE_UNITS]='start restart reload-or-restart force-reload'
[STOPPABLE_UNITS]='stop kill try-restart condrestart'
[ISOLATEBLE_UNITS]='isolate'
- [RELOADABLE_UNITS]='reload reload-or-try-restart force-reload'
+ [RELOADABLE_UNITS]='reload reload-or-try-restart'
[JOBS]='cancel'
[SNAPSHOTS]='delete'
[ENVS]='set-environment unset-environment'
diff --git a/src/systemctl.c b/src/systemctl.c
index 4768fb2..3ca18d1 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -1321,9 +1321,9 @@ static int start_unit(DBusConnection *bus, char **args,
unsigned n) {
streq(args[0], "restart") ?
"RestartUnit" :
streq(args[0], "try-restart") ||
streq(args[0], "condrestart") ?
"TryRestartUnit" :
- streq(args[0], "reload-or-restart") ?
"ReloadOrRestartUnit" :
- streq(args[0], "reload-or-try-restart") ||
- streq(args[0], "force-reload") ?
"ReloadOrTryRestartUnit" :
+ streq(args[0], "reload-or-restart") ||
+ streq(args[0], "force-reload") ?
"ReloadOrRestartUnit" :
+ streq(args[0], "reload-or-try-restart") ?
"ReloadOrTryRestartUnit" :
"StartUnit";
mode =
_______________________________________________
systemd-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
