diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-11-30 22:29:33 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-11-30 22:36:08 -0500 |
| commit | e4c0fbe50c9a4a26efa4ae2b2350215be29b8660 (patch) | |
| tree | 230f4d555ddf19e19c16f5e91bf3813ed8b9a969 | |
| parent | e93c33d4aadb41427f215d43545e7fadc6bcec6f (diff) | |
systemctl: do not show SourcePath when FragmentPath cannot be found
Those files can be in a completely deferent format and also
arbitrarily long, and usually contain information about other
stuff. If we ever add SourceLine= or SourceLines= in addition
to SourcePath=, and can show the relevant information only, this
commit can be reverted.
| -rw-r--r-- | man/systemctl.xml | 8 | ||||
| -rw-r--r-- | src/systemctl/systemctl.c | 17 |
2 files changed, 4 insertions, 21 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml index 5a15e5ca05..a84a98338c 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -737,10 +737,10 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <term><command>cat <replaceable>NAME</replaceable>...</command></term> <listitem> - <para>Show backing files of one or more units. - Prints the fragment, drop-ins, and source (sysvinit compat) - of units. Each file is preceded by a comment which includes the - file name.</para> + <para>Show backing files of one or more units. Prints the + "fragment" and "drop-ins" (source files) of units. Each + file is preceded by a comment which includes the file + name.</para> </listitem> </varlistentry> <varlistentry> diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index f7b2fb4019..5dcefd7f18 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -3718,23 +3718,6 @@ static int cat(sd_bus *bus, char **args) { continue; } - if (isempty(fragment_path)) { - free(fragment_path); - fragment_path = NULL; - - if (sd_bus_get_property_string( - bus, - "org.freedesktop.systemd1", - unit, - "org.freedesktop.systemd1.Unit", - "SourcePath", - &error, - &fragment_path) < 0) { - log_warning("Failed to get SourcePath: %s", bus_error_message(&error, r)); - continue; - } - } - r = sd_bus_get_property_strv( bus, "org.freedesktop.systemd1", |