]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
systemctl: don't show vendor preset state for generated/transient units (#7711)
authorLennart Poettering <lennart@poettering.net>
Sat, 23 Dec 2017 23:47:24 +0000 (00:47 +0100)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 23 Dec 2017 23:47:24 +0000 (08:47 +0900)
Showing the preset state for those suggests they could actually be
enabled/disabled, but that concept doesn't exist for generated/transient
units, hence hide this information.

This came up here:

https://lists.freedesktop.org/archives/systemd-devel/2017-December/040022.html

src/systemctl/systemctl.c

index 50a10ace7749eacd1b5123c760d1176edf2823aa..45e2750c0cb7252b858125b14a3b1709fedcc81c 100644 (file)
@@ -4045,7 +4045,8 @@ static void print_status_info(
         if (i->load_error != 0)
                 printf("   Loaded: %s%s%s (Reason: %s)\n",
                        on, strna(i->load_state), off, i->load_error);
-        else if (path && !isempty(i->unit_file_state) && !isempty(i->unit_file_preset))
+        else if (path && !isempty(i->unit_file_state) && !isempty(i->unit_file_preset) &&
+                 !STR_IN_SET(i->unit_file_state, "generated", "transient"))
                 printf("   Loaded: %s%s%s (%s; %s; vendor preset: %s)\n",
                        on, strna(i->load_state), off, path, i->unit_file_state, i->unit_file_preset);
         else if (path && !isempty(i->unit_file_state))