47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
|
From 1f89214e6e990a0b552f6854f87f8514ca384956 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
|
||
|
|
Date: Fri, 21 Feb 2014 11:55:24 +0100
|
||
|
|
Subject: [PATCH] analyze/run: use bus_open_transport_systemd instead of
|
||
|
|
bus_open_transport
|
||
|
|
|
||
|
|
Both systemd-analyze and systemd-run only access org.freedesktop.systemd1
|
||
|
|
on the bus. This patch allows using systemd-run --user and systemd-analyze
|
||
|
|
--user even if the user session's bus is not properly integrated with the
|
||
|
|
systemd user unit.
|
||
|
|
|
||
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=79252 and other reports...
|
||
|
|
---
|
||
|
|
src/analyze/analyze.c | 2 +-
|
||
|
|
src/run/run.c | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git src/analyze/analyze.c src/analyze/analyze.c
|
||
|
|
index 4c5fcfe..0a4190c 100644
|
||
|
|
--- src/analyze/analyze.c
|
||
|
|
+++ src/analyze/analyze.c
|
||
|
|
@@ -1335,7 +1335,7 @@ int main(int argc, char *argv[]) {
|
||
|
|
if (r <= 0)
|
||
|
|
goto finish;
|
||
|
|
|
||
|
|
- r = bus_open_transport(arg_transport, arg_host, arg_user, &bus);
|
||
|
|
+ r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus);
|
||
|
|
if (r < 0) {
|
||
|
|
log_error("Failed to create bus connection: %s", strerror(-r));
|
||
|
|
goto finish;
|
||
|
|
diff --git src/run/run.c src/run/run.c
|
||
|
|
index e4c695c..9d5527b 100644
|
||
|
|
--- src/run/run.c
|
||
|
|
+++ src/run/run.c
|
||
|
|
@@ -593,7 +593,7 @@ int main(int argc, char* argv[]) {
|
||
|
|
arg_description = description;
|
||
|
|
}
|
||
|
|
|
||
|
|
- r = bus_open_transport(arg_transport, arg_host, arg_user, &bus);
|
||
|
|
+ r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus);
|
||
|
|
if (r < 0) {
|
||
|
|
log_error("Failed to create bus connection: %s", strerror(-r));
|
||
|
|
goto finish;
|
||
|
|
--
|
||
|
|
1.7.9.2
|
||
|
|
|