From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 23 Dec 2017 23:47:24 +0000 (+0100)
Subject: systemctl: don't show vendor preset state for generated/transient units (#7711)
X-Git-Tag: v237~182
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15ce16477039f1bcdb7c9a4b3de8dc223804c2ca;p=thirdparty%2Fsystemd.git

systemctl: don't show vendor preset state for generated/transient units (#7711)

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

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 50a10ace774..45e2750c0cb 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -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))