summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-07-22 17:39:21 +0200
committerGitHub <noreply@github.com>2016-07-22 17:39:21 +0200
commite08ab37902bbd6e46ad1365f8ffa87fd700683e2 (patch)
treebbe42451d70e9f3aeccf85031442bc95c21ab218 /src
parent8a18507c55ea89451c32ae10d4cc11acc828b279 (diff)
systemctl: never check inhibitors if -H or -M are used (#3781)
Don't check inhibitors when operating remotely. The interactivity inhibitors imply can#t be provided anyway, and the current code checks for local sessions directly, via various sd_session_xyz() APIs, hence bypass it entirely if we operate on remote systems. Fixes: #3476
Diffstat (limited to 'src')
-rw-r--r--src/systemctl/systemctl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index d3f437411a..1dbe35997a 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3033,6 +3033,9 @@ static int logind_check_inhibitors(enum action a) {
if (!on_tty())
return 0;
+ if (arg_transport != BUS_TRANSPORT_LOCAL)
+ return 0;
+
r = acquire_bus(BUS_FULL, &bus);
if (r < 0)
return r;