summaryrefslogtreecommitdiff
path: root/src/pager.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-07-25 04:58:02 +0200
committerLennart Poettering <lennart@poettering.net>2011-07-25 04:58:02 +0200
commit729e3769c32242bbba26ea96900be005d52ce438 (patch)
treea8a6234044790254e3834e1e67971df93613b918 /src/pager.c
parent4b7a6af440ee1a957fd8fe1c6ca3b7f310fdf77c (diff)
systemctl: hook up new install logic
This adds a number of new options to systemctl, for presets, reenabling, masking/unmask, and runtime operations.
Diffstat (limited to 'src/pager.c')
-rw-r--r--src/pager.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pager.c b/src/pager.c
index 6ea25ada65..be284da962 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -39,13 +39,13 @@ void pager_open(void) {
if (pager_pid > 0)
return;
- if (isatty(STDOUT_FILENO) <= 0)
- return;
-
if ((pager = getenv("SYSTEMD_PAGER")) || (pager = getenv("PAGER")))
if (!*pager || streq(pager, "cat"))
return;
+ if (isatty(STDOUT_FILENO) <= 0)
+ return;
+
/* Determine and cache number of columns before we spawn the
* pager so that we get the value from the actual tty */
columns();