|
|
bbf564a |
From abebb5af9a7f5da77425aab1ecadd9bfcad53009 Mon Sep 17 00:00:00 2001
|
|
|
bbf564a |
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
|
|
|
bbf564a |
Date: Sat, 18 Jun 2011 16:23:43 +0300
|
|
|
bbf564a |
Subject: [PATCH] systemctl: Add SYSTEMD_PAGER for setting the pager to use in
|
|
|
bbf564a |
systemctl
|
|
|
bbf564a |
|
|
|
bbf564a |
---
|
|
|
bbf564a |
man/systemctl.xml | 16 ++++++++++++++++
|
|
|
bbf564a |
src/systemctl.c | 2 +-
|
|
|
bbf564a |
2 files changed, 17 insertions(+), 1 deletions(-)
|
|
|
bbf564a |
|
|
|
bbf564a |
diff --git a/man/systemctl.xml b/man/systemctl.xml
|
|
|
bbf564a |
index a9e86ce..2fd2b7b 100644
|
|
|
bbf564a |
--- a/man/systemctl.xml
|
|
|
bbf564a |
+++ b/man/systemctl.xml
|
|
|
bbf564a |
@@ -1022,6 +1022,22 @@
|
|
|
bbf564a |
</refsect1>
|
|
|
bbf564a |
|
|
|
bbf564a |
<refsect1>
|
|
|
bbf564a |
+ <title>Environment</title>
|
|
|
bbf564a |
+
|
|
|
bbf564a |
+ <variablelist>
|
|
|
bbf564a |
+ <varlistentry>
|
|
|
bbf564a |
+ <term><varname>$SYSTEMD_PAGER</varname></term>
|
|
|
bbf564a |
+ <listitem><para>Pager to use when
|
|
|
bbf564a |
+ <option>--no-pager</option> is not given;
|
|
|
bbf564a |
+ overrides <varname>$PAGER</varname>. Setting
|
|
|
bbf564a |
+ this to an empty string or the value
|
|
|
bbf564a |
+ <literal>cat</literal> is equivalent to passing
|
|
|
bbf564a |
+ <option>--no-pager</option>.</para></listitem>
|
|
|
bbf564a |
+ </varlistentry>
|
|
|
bbf564a |
+ </variablelist>
|
|
|
bbf564a |
+ </refsect1>
|
|
|
bbf564a |
+
|
|
|
bbf564a |
+ <refsect1>
|
|
|
bbf564a |
<title>See Also</title>
|
|
|
bbf564a |
<para>
|
|
|
bbf564a |
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
|
|
bbf564a |
diff --git a/src/systemctl.c b/src/systemctl.c
|
|
|
bbf564a |
index 08c7fab..ab41566 100644
|
|
|
bbf564a |
--- a/src/systemctl.c
|
|
|
bbf564a |
+++ b/src/systemctl.c
|
|
|
bbf564a |
@@ -5572,7 +5572,7 @@ static void pager_open(void) {
|
|
|
bbf564a |
if (!on_tty() || arg_no_pager)
|
|
|
bbf564a |
return;
|
|
|
bbf564a |
|
|
|
bbf564a |
- if ((pager = getenv("PAGER")))
|
|
|
bbf564a |
+ if ((pager = getenv("SYSTEMD_PAGER")) || (pager = getenv("PAGER")))
|
|
|
bbf564a |
if (!*pager || streq(pager, "cat"))
|
|
|
bbf564a |
return;
|
|
|
bbf564a |
|
|
|
bbf564a |
--
|
|
|
bbf564a |
1.7.4.4
|
|
|
bbf564a |
|