shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-06 12:58:22 +03:00
Code

systemctl: stop saying "vendor preset"

Browse Source 
We have vendor presets, and local admin presets, and runtime presets
(under /usr/lib, /usr/local/lib and /etc, /run, respectively). When we
display preset state, it can be configured in any of those places, so
we shouldn't say anything about the origin.

(Another nice advantage is that it improves alignment:

[root@f36 ~]# systemctl list-unit-files multipathd.service
UNIT FILE          STATE   VENDOR PRESET
multipathd.service enabled enabled

^ this looks we have a "PRESET" column that is empty.)

(cherry picked from commit c1e0dc9c882dfae7ba4bf49c50fd253ea199e7d9)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-04-01 10:15:54 +02:00
parent 81d33ab7f6
commit a385019e58
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/systemctl.xml
View File

@ -221,7 +221,7 @@ Sun 2017-02-26 20:57:49 EST 2h 3min left Sun 2017-02-26 11:56:36 EST 6h ago
<programlisting>$ systemctl status bluetooth
● bluetooth.service - Bluetooth service
Loaded: loaded (/usr/lib/systemd/system/bluetooth.service; enabled; vendor preset: enabled)
Loaded: loaded (/usr/lib/systemd/system/bluetooth.service; enabled; preset: enabled)
Active: active (running) since Wed 2017-01-04 13:54:04 EST; 1 weeks 0 days ago
Docs: man:bluetoothd(8)
Main PID: 930 (bluetoothd)

2
src/systemctl/systemctl-list-unit-files.c
View File

@ -54,7 +54,7 @@ static int output_unit_file_list(const UnitFileList *units, unsigned c) {
_cleanup_(unit_file_presets_freep) UnitFilePresets presets = {};
int r;
table = table_new("unit file", "state", "vendor preset");
table = table_new("unit file", "state", "preset");
if (!table)
return log_oom();

8
src/systemctl/systemctl-show.c
View File

@ -318,7 +318,7 @@ static void print_status_info(
bool *ellipsized) {
const char *active_on, *active_off, *on, *off, *ss, *fs;
const char *enable_on, *enable_off, *enable_vendor_on, *enable_vendor_off;
const char *enable_on, *enable_off, *preset_on, *preset_off;
_cleanup_free_ char *formatted_path = NULL;
usec_t timestamp;
const char *path;
@ -331,7 +331,7 @@ static void print_status_info(
format_active_state(i->active_state, &active_on, &active_off);
format_enable_state(i->unit_file_state, &enable_on, &enable_off);
format_enable_state(i->unit_file_preset, &enable_vendor_on, &enable_vendor_off);
format_enable_state(i->unit_file_preset, &preset_on, &preset_off);
const SpecialGlyph glyph = unit_active_state_to_glyph(unit_active_state_from_string(i->active_state));
@ -366,8 +366,8 @@ static void print_status_info(
on, strna(i->load_state), off,
path,
enable_on, i->unit_file_state, enable_off,
show_preset ? "; vendor preset: " : "",
enable_vendor_on, show_preset ? i->unit_file_preset : "", enable_vendor_off);
show_preset ? "; preset: " : "",
preset_on, show_preset ? i->unit_file_preset : "", preset_off);
} else if (path)
printf(" Loaded: %s%s%s (%s)\n",