[systemd-commits] 2 commits - man/daemon.xml src/systemctl.c

[Lennart Poettering]

 man/daemon.xml  |    2 +-
 src/systemctl.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 64e5f1b721d76948e2987f65841dc087f684e1de
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Mar 1 22:19:08 2011 +0100

    systemctl: add condreload alias for compat with ALTLinux

diff --git a/src/systemctl.c b/src/systemctl.c
index c08e78c..c3f47a1 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -1421,6 +1421,7 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) {
                         streq(args[0], "condrestart")           ? "TryRestartUnit" :
                         streq(args[0], "reload-or-restart")     ? "ReloadOrRestartUnit" :
                         streq(args[0], "reload-or-try-restart") ||
+                        streq(args[0], "condreload") ||
                         streq(args[0], "force-reload")          ? "ReloadOrTryRestartUnit" :
                                                                   "StartUnit";
 
@@ -5166,6 +5167,7 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError
                 { "reload-or-restart",     MORE,  2, start_unit        },
                 { "reload-or-try-restart", MORE,  2, start_unit        },
                 { "force-reload",          MORE,  2, start_unit        }, /* For compatibility with SysV */
+                { "condreload",            MORE,  2, start_unit        }, /* For compatibility with ALTLinux */
                 { "condrestart",           MORE,  2, start_unit        }, /* For compatibility with RH */
                 { "isolate",               EQUAL, 2, start_unit        },
                 { "kill",                  MORE,  2, kill_unit         },

commit 6221fcdf2ec74b6a71a4d59ca5ec80fa2b214c45
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Mar 1 22:18:49 2011 +0100

    man: fix chkconfig syntax to use --level 3

diff --git a/man/daemon.xml b/man/daemon.xml
index ea0e6d2..ab355cd 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -869,7 +869,7 @@ fi</programlisting>
                         a fragment like the following:</para>
 
                         <programlisting>%triggerun -- foobar &lt; 0.47.11-1
-if /sbin/chkconfig foobar ; then
+if /sbin/chkconfig --level 3 foobar ; then
         /bin/systemctl --no-reload enable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
 fi</programlisting>