diff options
| -rw-r--r-- | man/systemctl.xml | 2 | ||||
| -rw-r--r-- | src/systemctl/systemctl-list-unit-files.c | 2 | ||||
| -rw-r--r-- | src/systemctl/systemctl-show.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml index 963eb9ec3a..3d03c0374b 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -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) diff --git a/src/systemctl/systemctl-list-unit-files.c b/src/systemctl/systemctl-list-unit-files.c index 552e85a06b..fa7a789b28 100644 --- a/src/systemctl/systemctl-list-unit-files.c +++ b/src/systemctl/systemctl-list-unit-files.c @@ -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(); diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c index 1c0b002734..c514109b17 100644 --- a/src/systemctl/systemctl-show.c +++ b/src/systemctl/systemctl-show.c @@ -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", |