From: Cireo <reid.price@gmail.com>
Date: Thu, 1 Sep 2016 09:04:36 +0000 (-0700)
Subject: systemctl: usable status command for special units (#4072)
X-Git-Tag: v232~236
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6405ca288ed3458589c82b6c6ddf87e8c054858;p=thirdparty%2Fsystemd.git

systemctl: usable status command for special units (#4072)

Prior to this commit, users could be given an unusable command to run if
they attempted to stop or start special services.  For example:

    $ systemctl stop -- -.mount
    Failed to stop -.mount: Operation refused, unit -.mount may be \
        requested by dependency only.
    See system logs and 'systemctl status -.mount' for details.

    $ systemctl status -.mount
    systemctl: invalid option -- '.'

This adds a '--' to the example command in these situations.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 682805045d9..59124411688 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2720,9 +2720,10 @@ static int start_unit_one(
 
                 if (!sd_bus_error_has_name(error, BUS_ERROR_NO_SUCH_UNIT) &&
                     !sd_bus_error_has_name(error, BUS_ERROR_UNIT_MASKED))
-                        log_error("See %s logs and 'systemctl%s status %s' for details.",
+                        log_error("See %s logs and 'systemctl%s status%s %s' for details.",
                                    arg_scope == UNIT_FILE_SYSTEM ? "system" : "user",
                                    arg_scope == UNIT_FILE_SYSTEM ? "" : " --user",
+                                   name[0] == '-' ? " --" : "",
                                    name);
 
                 return r;