From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 5 Jul 2023 00:58:57 +0000 (+0900)
Subject: journal-upload: replace deprecated sd_journal_open_container()
X-Git-Tag: v254-rc1~31^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c6673afab96671bee6bba7dbac76e33fdf8c070;p=thirdparty%2Fsystemd.git

journal-upload: replace deprecated sd_journal_open_container()
---

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 404312b4d39..9d53cc4d096 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -21,6 +21,7 @@
 #include "fs-util.h"
 #include "glob-util.h"
 #include "journal-upload.h"
+#include "journal-util.h"
 #include "log.h"
 #include "main-func.h"
 #include "mkdir.h"
@@ -773,13 +774,9 @@ static int open_journal(sd_journal **j) {
                 r = sd_journal_open_directory(j, arg_directory, arg_journal_type);
         else if (arg_file)
                 r = sd_journal_open_files(j, (const char**) arg_file, 0);
-        else if (arg_machine) {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-                /* FIXME: replace with D-Bus call OpenMachineRootDirectory() so that things also work with raw disk images */
-                r = sd_journal_open_container(j, arg_machine, 0);
-#pragma GCC diagnostic pop
-        } else
+        else if (arg_machine)
+                r = journal_open_machine(j, arg_machine);
+        else
                 r = sd_journal_open_namespace(j, arg_namespace,
                                               (arg_merge ? 0 : SD_JOURNAL_LOCAL_ONLY) | arg_namespace_flags | arg_journal_type);
         if (r < 0)