From e4c0fbe50c9a4a26efa4ae2b2350215be29b8660 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 30 Nov 2013 22:29:33 -0500 Subject: [PATCH] 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. --- man/systemctl.xml | 8 ++++---- src/systemctl/systemctl.c | 17 ----------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/man/systemctl.xml b/man/systemctl.xml index 5a15e5ca0..a84a98338 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -737,10 +737,10 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service cat NAME... - 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. + 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. diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index f7b2fb401..5dcefd7f1 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", -- 2.30.2