diff options
author | Lennart Poettering <lennart@poettering.net> | 2011-07-07 03:30:31 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2011-07-07 03:30:31 +0200 |
commit | 3b0727f5ec728206bf0db669088c9aa9ebb3c829 (patch) | |
tree | b72cb0bc7b85443fb0c3e6fe8e9433ea3fdf3ebe | |
parent | loginctl: add basic implementation of loginctl for introspecting controlling ... (diff) | |
download | systemd-3b0727f5ec728206bf0db669088c9aa9ebb3c829.tar.gz systemd-3b0727f5ec728206bf0db669088c9aa9ebb3c829.tar.bz2 systemd-3b0727f5ec728206bf0db669088c9aa9ebb3c829.zip |
systemctl: cache tty value before we open the pager
-rw-r--r-- | src/systemctl.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/systemctl.c b/src/systemctl.c index 556070bcb..6b4f98106 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -122,11 +122,6 @@ static pid_t agent_pid = 0; static int daemon_reload(DBusConnection *bus, char **args, unsigned n); -static void pager_open_if_enabled(void) { - if (!arg_no_pager) - pager_open(); -} - static bool on_tty(void) { static int t = -1; @@ -142,6 +137,13 @@ static bool on_tty(void) { return t; } +static void pager_open_if_enabled(void) { + on_tty(); + + if (!arg_no_pager) + pager_open(); +} + static void spawn_ask_password_agent(void) { pid_t parent; |