30 lines
1.6 KiB
Diff
30 lines
1.6 KiB
Diff
From ac26db038e67ea7fe8236cfafabcba74ad89b894 Mon Sep 17 00:00:00 2001
|
|
From: Colin Walters <walters@verbum.org>
|
|
Date: Thu, 22 Oct 2020 14:25:51 +0000
|
|
Subject: [PATCH] sysroot: Fix usage of sd_journal_send on 32 bit
|
|
|
|
See https://bugzilla.redhat.com/show_bug.cgi?id=1890577
|
|
|
|
This is the same as https://github.com/ostreedev/ostree/pull/2219
|
|
---
|
|
src/daemon/rpmostree-sysroot-upgrader.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/daemon/rpmostree-sysroot-upgrader.c b/src/daemon/rpmostree-sysroot-upgrader.c
|
|
index 32e77a0a3..7a8e1e9ea 100644
|
|
--- a/src/daemon/rpmostree-sysroot-upgrader.c
|
|
+++ b/src/daemon/rpmostree-sysroot-upgrader.c
|
|
@@ -1328,9 +1328,9 @@ write_history (RpmOstreeSysrootUpgrader *self,
|
|
SD_ID128_FORMAT_VAL(RPMOSTREE_NEW_DEPLOYMENT_MSG),
|
|
"MESSAGE=Created new deployment /%s", deployment_dirpath,
|
|
"DEPLOYMENT_PATH=/%s", deployment_dirpath,
|
|
- "DEPLOYMENT_TIMESTAMP=%ld", stbuf.st_ctime,
|
|
- "DEPLOYMENT_DEVICE=%u", stbuf.st_dev,
|
|
- "DEPLOYMENT_INODE=%u", stbuf.st_ino,
|
|
+ "DEPLOYMENT_TIMESTAMP=%" PRIu64, (uint64_t) stbuf.st_ctime,
|
|
+ "DEPLOYMENT_DEVICE=%" PRIu64, (uint64_t) stbuf.st_dev,
|
|
+ "DEPLOYMENT_INODE=%" PRIu64, (uint64_t) stbuf.st_ino,
|
|
"DEPLOYMENT_CHECKSUM=%s", ostree_deployment_get_csum (new_deployment),
|
|
"DEPLOYMENT_REFSPEC=%s", rpmostree_origin_get_refspec (self->origin),
|
|
/* we could use iovecs here and sd_journal_sendv to make these truly
|