|
 |
3ff8d3 |
From dec9eab2030a212b3713379af9d74c625ecce137 Mon Sep 17 00:00:00 2001
|
|
|
3ff8d3 |
From: Jonathan Lebon <jonathan@jlebon.com>
|
|
|
3ff8d3 |
Date: Thu, 15 Oct 2020 12:05:34 -0400
|
|
|
3ff8d3 |
Subject: [PATCH] ostree-prepare-root: print st_dev and st_ino as 64-bit ints
|
|
|
3ff8d3 |
|
|
|
3ff8d3 |
This matches what systemd does and should work fine on all platforms.
|
|
|
3ff8d3 |
|
|
|
3ff8d3 |
Possibly resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1888436
|
|
|
3ff8d3 |
---
|
|
|
3ff8d3 |
src/switchroot/ostree-prepare-root.c | 4 ++--
|
|
|
3ff8d3 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
3ff8d3 |
|
|
|
3ff8d3 |
diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c
|
|
|
3ff8d3 |
index 6351babb..6bc2c374 100644
|
|
|
3ff8d3 |
--- a/src/switchroot/ostree-prepare-root.c
|
|
|
3ff8d3 |
+++ b/src/switchroot/ostree-prepare-root.c
|
|
|
3ff8d3 |
@@ -152,8 +152,8 @@ resolve_deploy_path (const char * root_mountpoint)
|
|
|
3ff8d3 |
"MESSAGE_ID=" SD_ID128_FORMAT_STR,
|
|
|
3ff8d3 |
SD_ID128_FORMAT_VAL(OSTREE_PREPARE_ROOT_DEPLOYMENT_MSG),
|
|
|
3ff8d3 |
"DEPLOYMENT_PATH=%s", resolved_path,
|
|
|
3ff8d3 |
- "DEPLOYMENT_DEVICE=%u", stbuf.st_dev,
|
|
|
3ff8d3 |
- "DEPLOYMENT_INODE=%u", stbuf.st_ino,
|
|
|
3ff8d3 |
+ "DEPLOYMENT_DEVICE=%" PRIu64, (uint64_t) stbuf.st_dev,
|
|
|
3ff8d3 |
+ "DEPLOYMENT_INODE=%" PRIu64, (uint64_t) stbuf.st_ino,
|
|
|
3ff8d3 |
NULL);
|
|
|
3ff8d3 |
#endif
|
|
|
3ff8d3 |
return deploy_path;
|
|
|
3ff8d3 |
--
|
|
|
3ff8d3 |
2.26.2
|
|
|
3ff8d3 |
|