prepare-root: Fix compilation with --with-static-compiler

Closes: https://github.com/ostreedev/ostree/issues/1845

Closes: #1846
Approved by: akiernan
This commit is contained in:
Colin Walters authored and Atomic Bot committed 2019-04-25 13:00:40 +00:00
1 parent 586cc2deee
commit 304abee9eb
2 files changed
+7 -3

No files matched your search

+6 -2
View File
@@ -47,7 +47,11 @@
#include <errno.h>
#include <ctype.h>
#ifdef HAVE_LIBSYSTEMD
#if defined(HAVE_LIBSYSTEMD) && !defined(OSTREE_PREPARE_ROOT_STATIC)
#define USE_LIBSYSTEMD
#endif
#ifdef USE_LIBSYSTEMD
#include <systemd/sd-journal.h>
#define OSTREE_PREPARE_ROOT_DEPLOYMENT_MSG SD_ID128_MAKE(71,70,33,6a,73,ba,46,01,ba,d3,1a,f8,88,aa,0d,f7)
#endif
@@ -79,7 +83,7 @@ resolve_deploy_path (const char * root_mountpoint)
if (stat (deploy_path, &stbuf) < 0)
err (EXIT_FAILURE, "stat(%s) failed", deploy_path);
/* Quiet logs if there's no journal */
#ifdef HAVE_LIBSYSTEMD
#ifdef USE_LIBSYSTEMD
const char *resolved_path = deploy_path + strlen (root_mountpoint);
sd_journal_send ("MESSAGE=Resolved OSTree target to: %s", deploy_path,
"MESSAGE_ID=" SD_ID128_FORMAT_STR,