summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-05-07 18:40:57 +0200
committerLennart Poettering <lennart@poettering.net>2016-05-07 18:40:57 +0200
commite76f4732f186236429773ed89d3b71bbb0b64b2a (patch)
tree08bbbc5ca7dac5253e587c0383243eb179cffb97
parent5ab42bc85a11a5250dcdf8e86291d3da90aa84bd (diff)
parent8951eaec50c3c7deecb2259f26ad6ac39573f229 (diff)
Merge pull request #3215 from keszybz/news-and-other-small-cleanups
News and other small cleanups
-rw-r--r--NEWS15
-rw-r--r--src/systemctl/systemctl.c9
2 files changed, 12 insertions, 12 deletions
diff --git a/NEWS b/NEWS
index 5163637de2..8f1cde01e8 100644
--- a/NEWS
+++ b/NEWS
@@ -38,7 +38,7 @@ CHANGES WITH 230 in spe:
and any service that should survive the end of any individual login
session can be started at a user service or scope using systemd-run.
systemd-run(1) man page has been extended with an example which shows
- how to run screen in a scope unit underneath user@.service. The same
+ how to run screen in a scope unit underneath user@.service. The same
command works for tmux.
After the user logs out of all sessions, user@.service will be
@@ -62,8 +62,8 @@ CHANGES WITH 230 in spe:
* LLDP support has been extended, and both passive (receive-only) and
active (sender) modes are supported. Passive mode ("routers-only") is
- enabled by default in systemd-networkd. Active LLDP mode is enabled
- by default for containers on the internal network. The "networkctl
+ enabled by default in systemd-networkd. Active LLDP mode is enabled
+ by default for containers on the internal network. The "networkctl
lldp" command may be used to list information gathered. "networkctl
status" will also show basic LLDP information on connected peers now.
@@ -101,7 +101,8 @@ CHANGES WITH 230 in spe:
* "systemctl show" gained a new --value switch, which allows print a
only the contents of a specific unit property, without also printing
- the property's name.
+ the property's name. Similar support was added to "show*" verbs
+ of loginctl and machinectl that output "key=value" lists.
* A new command "systemctl revert" has been added that may be used to
revert to the vendor version of a unit file, in case local changes
@@ -142,9 +143,9 @@ CHANGES WITH 230 in spe:
changed to use this functionality by default.
* The default start timeout may now be configured on the kernel command
- line via systemd.default_timeout_start_sec=. It was configurable
- previously via the DefaultTimeoutStartSec= option in
- /etc/systemd/system.conf already.
+ line via systemd.default_timeout_start_sec=. It was already
+ configurable via the DefaultTimeoutStartSec= option in
+ /etc/systemd/system.conf.
* Socket units gained a new TriggerLimitIntervalSec= and
TriggerLimitBurst= setting to configure a limit on the activation
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 7d0d4966d5..639080bc66 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1355,7 +1355,7 @@ static void output_unit_file_list(const UnitFileList *units, unsigned c) {
} else
id_cols = max_id_len;
- if (!arg_no_legend)
+ if (!arg_no_legend && c > 0)
printf("%-*s %-*s\n",
id_cols, "UNIT FILE",
state_cols, "STATE");
@@ -1422,8 +1422,8 @@ static int list_unit_files(int argc, char *argv[], void *userdata) {
n_units = hashmap_size(h);
- units = new(UnitFileList, n_units);
- if (!units && n_units > 0) {
+ units = new(UnitFileList, n_units ?: 1); /* avoid malloc(0) */
+ if (!units) {
unit_file_list_free(h);
return log_oom();
}
@@ -1519,10 +1519,9 @@ static int list_unit_files(int argc, char *argv[], void *userdata) {
qsort_safe(units, c, sizeof(UnitFileList), compare_unit_file_list);
output_unit_file_list(units, c);
- if (install_client_side()) {
+ if (install_client_side())
for (unit = units; unit < units + c; unit++)
free(unit->path);
- }
return 0;
}