diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-14 20:09:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 20:09:39 +0100 |
| commit | 042cad5737917e6964ddddba72b8fcc0cb890877 (patch) | |
| tree | 7085fa0272983217e94d5ce8f84cd5056d6ece31 /src/core | |
| parent | core: drop dbus queue recursion check (diff) | |
| parent | man: use <keycombo> more (diff) | |
| download | systemd-042cad5737917e6964ddddba72b8fcc0cb890877.tar.xz systemd-042cad5737917e6964ddddba72b8fcc0cb890877.zip | |
Merge pull request #10753 from keszybz/pager-no-interrupt
Add mode in journalctl where ^C is handled by the pager
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ima-setup.c | 1 | ||||
| -rw-r--r-- | src/core/main.c | 6 | ||||
| -rw-r--r-- | src/core/smack-setup.c | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c index d9e5cf4f05..fd7c5f64af 100644 --- a/src/core/ima-setup.c +++ b/src/core/ima-setup.c @@ -8,7 +8,6 @@ #include <unistd.h> #include "alloc-util.h" -#include "def.h" #include "fd-util.h" #include "fileio.h" #include "ima-setup.h" diff --git a/src/core/main.c b/src/core/main.c index a866160d76..11537c8140 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -98,7 +98,7 @@ static bool arg_crash_reboot = false; static char *arg_confirm_spawn = NULL; static ShowStatus arg_show_status = _SHOW_STATUS_INVALID; static bool arg_switched_root = false; -static bool arg_no_pager = false; +static PagerFlags arg_pager_flags = 0; static bool arg_service_watchdogs = true; static char ***arg_join_controllers = NULL; static ExecOutput arg_default_std_output = EXEC_OUTPUT_JOURNAL; @@ -922,7 +922,7 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_NO_PAGER: - arg_no_pager = true; + arg_pager_flags |= PAGER_DISABLE; break; case ARG_VERSION: @@ -2448,7 +2448,7 @@ int main(int argc, char *argv[]) { goto finish; if (IN_SET(arg_action, ACTION_TEST, ACTION_HELP, ACTION_DUMP_CONFIGURATION_ITEMS, ACTION_DUMP_BUS_PROPERTIES)) - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); if (arg_action != ACTION_RUN) skip_setup = true; diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c index 4e9506f09c..4bb2051aa3 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c @@ -14,7 +14,6 @@ #include <string.h> #include "alloc-util.h" -#include "def.h" #include "dirent-util.h" #include "fd-util.h" #include "fileio.h" |