diff options
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | man/journalctl.xml | 14 | ||||
| -rw-r--r-- | src/journal/journalctl.c | 21 |
3 files changed, 32 insertions, 5 deletions
@@ -144,8 +144,6 @@ Features: * timedate: have global on/off switches for auto-time (NTP), and auto-timezone that connman can subscribe to. -* support --root= in msgcatalog compiler - * Honour "-" prefix for InaccessibleDirectories= and ReadOnlyDirectories= to suppress errors of the specified path doesn't exist diff --git a/man/journalctl.xml b/man/journalctl.xml index 6b4b7572f6..144b54f663 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -448,6 +448,20 @@ </varlistentry> <varlistentry> + <term><option>--root=<replaceable>ROOT</replaceable></option></term> + + <listitem><para>Takes a directory path + as argument. If specified journalctl + will operate on catalog file hierarchy + underneath the specified directory + instead of the root directory + (e.g. <option>--update-catalog</option> + will create + <filename><replaceable>ROOT</replaceable>/var/lib/systemd/catalog/database</filename>). + </para></listitem> + </varlistentry> + + <varlistentry> <term><option>--new-id128</option></term> <listitem><para>Instead of showing diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 03daafe9db..3ae6482e99 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -86,6 +86,7 @@ static bool arg_unit_system; static const char *arg_field = NULL; static bool arg_catalog = false; static bool arg_reverse = false; +static const char *arg_root = NULL; static enum { ACTION_SHOW, @@ -125,6 +126,7 @@ static int help(void) { " --no-pager Do not pipe output into a pager\n" " -m --merge Show entries from all available journals\n" " -D --directory=PATH Show journal files from directory\n" + " --root=ROOT Operate on catalog files underneath the root ROOT\n" #ifdef HAVE_GCRYPT " --interval=TIME Time interval for changing the FSS sealing key\n" " --verify-key=KEY Specify FSS verification key\n" @@ -155,6 +157,7 @@ static int parse_argv(int argc, char *argv[]) { ARG_NO_PAGER, ARG_NO_TAIL, ARG_NEW_ID128, + ARG_ROOT, ARG_HEADER, ARG_FULL, ARG_SETUP_KEYS, @@ -186,6 +189,7 @@ static int parse_argv(int argc, char *argv[]) { { "merge", no_argument, NULL, 'm' }, { "this-boot", no_argument, NULL, 'b' }, { "directory", required_argument, NULL, 'D' }, + { "root", required_argument, NULL, ARG_ROOT }, { "header", no_argument, NULL, ARG_HEADER }, { "priority", required_argument, NULL, 'p' }, { "setup-keys", no_argument, NULL, ARG_SETUP_KEYS }, @@ -318,6 +322,10 @@ static int parse_argv(int argc, char *argv[]) { arg_directory = optarg; break; + case ARG_ROOT: + arg_root = optarg; + break; + case 'c': arg_cursor = optarg; break; @@ -1024,18 +1032,25 @@ int main(int argc, char *argv[]) { arg_action == ACTION_LIST_CATALOG || arg_action == ACTION_DUMP_CATALOG) { + char _cleanup_free_ *database; + database = strjoin(arg_root, "/", CATALOG_DATABASE, NULL); + if (!database) { + r = log_oom(); + goto finish; + } + if (arg_action == ACTION_UPDATE_CATALOG) { - r = catalog_update(CATALOG_DATABASE, NULL, catalog_file_dirs); + r = catalog_update(database, arg_root, catalog_file_dirs); if (r < 0) log_error("Failed to list catalog: %s", strerror(-r)); } else { bool oneline = arg_action == ACTION_LIST_CATALOG; if (optind < argc) - r = catalog_list_items(stdout, CATALOG_DATABASE, + r = catalog_list_items(stdout, database, oneline, argv + optind); else - r = catalog_list(stdout, CATALOG_DATABASE, oneline); + r = catalog_list(stdout, database, oneline); if (r < 0) log_error("Failed to list catalog: %s", strerror(-r)); } |