picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

journalctl: add -k/--dmesg

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-05-14 23:08:00 -04:00
parent b37250d661
commit 9927180417
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -36,8 +36,6 @@ Features:
makes the audit userspace to think auditing is not available in the
kernel.
* maybe add "journalctl -k" as shortcut for "-b _TRANSPORT=kernel"
* Introduce a way how we can kill the main process of a service with KillSignal, but all processes with SIGKILL later on
https://bugzilla.redhat.com/show_bug.cgi?id=952634

33
src/journal/journalctl.c
View File

@ -71,6 +71,7 @@ static bool arg_no_tail = false;
static bool arg_quiet = false;
static bool arg_merge = false;
static bool arg_this_boot = false;
static bool arg_dmesg = false;
static const char *arg_cursor = NULL;
static const char *arg_directory = NULL;
static int arg_priorities = 0xFF;
@ -108,6 +109,7 @@ static int help(void) {
" --until=DATE Stop showing entries older or of the specified date\n"
" -c --cursor=CURSOR Start showing entries from specified cursor\n"
" -b --this-boot Show data only from current boot\n"
" -k --dmesg Show kmsg log from current boot\n"
" -u --unit=UNIT Show data only from the specified unit\n"
" --user-unit=UNIT Show data only from the specified user session unit\n"
" -p --priority=RANGE Show only messages within the specified priority range\n"
@ -187,6 +189,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "quiet", no_argument, NULL, 'q' },
{ "merge", no_argument, NULL, 'm' },
{ "this-boot", no_argument, NULL, 'b' },
{ "dmesg", no_argument, NULL, 'k' },
{ "directory", required_argument, NULL, 'D' },
{ "root", required_argument, NULL, ARG_ROOT },
{ "header", no_argument, NULL, ARG_HEADER },
@ -215,7 +218,7 @@ static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
while ((c = getopt_long(argc, argv, "hefo:an::qmbD:p:c:u:F:xr", options, NULL)) >= 0) {
while ((c = getopt_long(argc, argv, "hefo:an::qmbkD:p:c:u:F:xr", options, NULL)) >= 0) {
switch (c) {
@ -317,6 +320,10 @@ static int parse_argv(int argc, char *argv[]) {
arg_this_boot = true;
break;
case 'k':
arg_this_boot = arg_dmesg = true;
break;
case 'D':
arg_directory = optarg;
break;
@ -613,6 +620,26 @@ static int add_this_boot(sd_journal *j) {
return 0;
}
static int add_dmesg(sd_journal *j) {
int r;
assert(j);
if (!arg_dmesg)
return 0;
r = sd_journal_add_match(j, "_TRANSPORT=kernel", strlen("_TRANSPORT=kernel"));
if (r < 0) {
log_error("Failed to add match: %s", strerror(-r));
return r;
}
r = sd_journal_add_conjunction(j);
if (r < 0)
return r;
return 0;
}
static int add_units(sd_journal *j) {
_cleanup_free_ char *u = NULL;
int r;
@ -1129,6 +1156,10 @@ int main(int argc, char *argv[]) {
if (r < 0)
return EXIT_FAILURE;
r = add_dmesg(j);
if (r < 0)
return EXIT_FAILURE;
r = add_units(j);
strv_free(arg_system_units);
strv_free(arg_user_units);