jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2364 from HiassofT/le9-systemd

Browse Source 
systemd: enable hostnamed and add patch to fix systemd-analyze plot
This commit is contained in:
Lukas Rusak 2017-12-29 13:22:20 -08:00 committed by GitHub
commit f45b73d1ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/sysutils/systemd/package.mk
View File

@ -69,7 +69,7 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
-Dcoredump=false \
-Dresolve=false \
-Dlogind=true \
-Dhostnamed=false \
-Dhostnamed=true \
-Dlocaled=false \
-Dmachined=false \
-Dnetworkd=false \

43
packages/sysutils/systemd/patches/systemd-0100-backport-systemd-analyze-plot-fix.patch Normal file
View File

@ -0,0 +1,43 @@
From 1ddef8584afe34d0bb8f2629f360bcd02a7e0690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Mon, 18 Dec 2017 10:12:59 +0100
Subject: [PATCH] analyze: use normal bus connection for "plot" verb
We need to connect to hostnamed, so a private bus connection is no good.
It'd be simpler to use the normal bus connection unconditionally, but
that'd mean that e.g. systemd-analyze set-log-level might not work in
emergency mode. So let's keep trying to use the private connection except
for "plot".
Fixes #7667.
---
src/analyze/analyze.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index d45c1dc496..7f35b04c31 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -130,6 +130,13 @@ struct host_info {
char *architecture;
};
+static int acquire_bus(bool need_full_bus, sd_bus **bus) {
+ if (need_full_bus)
+ return bus_connect_transport(arg_transport, arg_host, arg_user, bus);
+ else
+ return bus_connect_transport_systemd(arg_transport, arg_host, arg_user, bus);
+}
+
static int bus_get_uint64_property(sd_bus *bus, const char *path, const char *interface, const char *property, uint64_t *val) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
int r;
@@ -1688,7 +1695,7 @@ int main(int argc, char *argv[]) {
else {
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
- r = bus_connect_transport_systemd(arg_transport, arg_host, arg_user, &bus);
+ r = acquire_bus(streq_ptr(argv[optind], "plot"), &bus);
if (r < 0) {
log_error_errno(r, "Failed to create bus connection: %m");
goto finish;