chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lookup: always also look into /usr/lib for units
[elogind.git]
/
src
/
systemctl.c
diff --git
a/src/systemctl.c
b/src/systemctl.c
index 4879b29d163a6dc31aa726daefd95b42dc9b101b..1507b52f92e4c4e964e9f56b7fdd2ccd18691e1f 100644
(file)
--- a/
src/systemctl.c
+++ b/
src/systemctl.c
@@
-387,7
+387,7
@@
static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
if (on_tty()) {
printf("%-25s %-6s %-*s %-*s %-*s", "UNIT", "LOAD",
active_len, "ACTIVE", sub_len, "SUB", job_len, "JOB");
if (on_tty()) {
printf("%-25s %-6s %-*s %-*s %-*s", "UNIT", "LOAD",
active_len, "ACTIVE", sub_len, "SUB", job_len, "JOB");
- if (columns() >= 80+12 || arg_full)
+ if (columns() >= 80+12 || arg_full
|| !arg_no_pager
)
printf(" %s\n", "DESCRIPTION");
else
printf("\n");
printf(" %s\n", "DESCRIPTION");
else
printf("\n");
@@
-440,7
+440,7
@@
static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
if (u->job_id == 0)
printf(" %-*s", job_len, "");
if (u->job_id == 0)
printf(" %-*s", job_len, "");
- if (arg_full)
+ if (arg_full
|| !arg_no_pager
)
printf(" %s", u->description);
else
printf(" %.*s", columns() - a - b - 1, u->description);
printf(" %s", u->description);
else
printf(" %.*s", columns() - a - b - 1, u->description);
@@
-3609,6
+3609,7
@@
static int config_parse_also(
unsigned line,
const char *section,
const char *lvalue,
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
const char *rvalue,
void *data,
void *userdata) {