summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-01-04 14:51:48 +0100
committerLennart Poettering <lennart@poettering.net>2011-01-04 14:54:53 +0100
commit75d12d5767c7788f86ca782ef459dee8e157c72e (patch)
treeaeeabf67494b460a6def74f98b6dab6e17089131
parenta05ea46dc788929bc8b13afb4208ca29cad68572 (diff)
systemctl: Don't use Debian's 'sensible-pager', use 'pager' instead
-rw-r--r--src/systemctl.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/systemctl.c b/src/systemctl.c
index 5d2efbe95f..4f4ee96172 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -118,6 +118,12 @@ static void pager_open(void);
static bool on_tty(void) {
static int t = -1;
+ /* Note that this is invoked relatively early, before we start
+ * the pager. That means the value we return reflects whether
+ * we originally were started on a tty, not if we currently
+ * are. But this is intended, since we want color, and so on
+ * when run in our own pager. */
+
if (_unlikely_(t < 0))
t = isatty(STDOUT_FILENO) > 0;
@@ -5336,7 +5342,14 @@ static void pager_open(void) {
execlp(pager, pager, NULL);
execl("/bin/sh", "sh", "-c", pager, NULL);
} else {
- execlp("sensible-pager", "sensible-pager", NULL);
+ /* Debian's alternatives command for pagers is
+ * called 'pager'. Note that we do not call
+ * sensible-pagers here, since that is just a
+ * shell script that implements a logic that
+ * is similar to this one anyway, but is
+ * Debian-specific. */
+ execlp("pager", "pager", NULL);
+
execlp("less", "less", NULL);
execlp("more", "more", NULL);
}