picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

systemctl: do not show SourcePath when FragmentPath cannot be found

Browse source 
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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-11-30 22:29:33 -05:00
parent e93c33d4aa
commit e4c0fbe50c
2 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
man/systemctl.xml
View file

@ -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>

17
src/systemctl/systemctl.c
View file

@ -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",