d743bb5bcc
This reverts commits3fb4a15096and0e8350ca14. Either building with meson or other upstream changes was causing issues with booting, and I didn't have time to debug this properly.
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
From 22b4881bf042aceaf079efec71447ef17aa7e913 Mon Sep 17 00:00:00 2001
|
|
From: Evgeny Vereshchagin <evvers@ya.ru>
|
|
Date: Mon, 10 Apr 2017 14:20:17 +0300
|
|
Subject: [PATCH] core: fix values of BindPaths and BindReadOnlyPaths
|
|
properties on 32-bit platforms (#5713)
|
|
|
|
$ busctl get-property \
|
|
org.freedesktop.systemd1 \
|
|
/org/freedesktop/systemd1/unit/run_2dr471de87550554a6dbb165501c33c5dab_2eservice \
|
|
org.freedesktop.systemd1.Service BindReadOnlyPaths
|
|
|
|
a(ssbt) 1 "/etc" "/etc" false 9228635523571007488
|
|
|
|
The correct values are 0 and 16384
|
|
(cherry picked from commit c9b061085678a8b00cf3631b123378fc6104a56f)
|
|
---
|
|
src/core/dbus-execute.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
|
|
index 7df4cab3f6..0454a28e12 100644
|
|
--- a/src/core/dbus-execute.c
|
|
+++ b/src/core/dbus-execute.c
|
|
@@ -710,7 +710,7 @@ static int property_get_bind_paths(
|
|
c->bind_mounts[i].source,
|
|
c->bind_mounts[i].destination,
|
|
c->bind_mounts[i].ignore_enoent,
|
|
- c->bind_mounts[i].recursive ? MS_REC : 0);
|
|
+ c->bind_mounts[i].recursive ? (uint64_t) MS_REC : (uint64_t) 0);
|
|
if (r < 0)
|
|
return r;
|
|
}
|