|
 |
ff6046 |
From 6bf178a9a6e3fd6544d8e37a0082febf81c0ad2d Mon Sep 17 00:00:00 2001
|
|
|
ff6046 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
ff6046 |
Date: Tue, 17 Jul 2018 12:23:26 +0200
|
|
|
ff6046 |
Subject: [PATCH] sd-bus: allow connecting to the pseudo-container ".host"
|
|
|
ff6046 |
|
|
|
ff6046 |
machined exposes the pseudo-container ".host" as a reference to the host
|
|
|
ff6046 |
system, and this means "machinectl login .host" and "machinectl shell
|
|
|
ff6046 |
.host" get your a login/shell on the host. systemd-run currently doesn't
|
|
|
ff6046 |
allow that. Let's fix that, and make sd-bus understand ".host" as an
|
|
|
ff6046 |
alias for connecting to the host system.
|
|
|
ff6046 |
|
|
|
ff6046 |
(cherry picked from commit 1e5057b904473696ae0d591d7555233adcb51fa4)
|
|
|
ff6046 |
|
|
|
ff6046 |
Resolves: #1683334
|
|
|
ff6046 |
---
|
|
|
ff6046 |
src/basic/util.c | 5 +++++
|
|
|
ff6046 |
src/libsystemd/sd-bus/sd-bus.c | 4 ++--
|
|
|
ff6046 |
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
ff6046 |
|
|
|
ff6046 |
diff --git a/src/basic/util.c b/src/basic/util.c
|
|
|
ff6046 |
index 8f2d6061da..82cb937314 100644
|
|
|
ff6046 |
--- a/src/basic/util.c
|
|
|
ff6046 |
+++ b/src/basic/util.c
|
|
|
ff6046 |
@@ -255,6 +255,11 @@ int container_get_leader(const char *machine, pid_t *pid) {
|
|
|
ff6046 |
assert(machine);
|
|
|
ff6046 |
assert(pid);
|
|
|
ff6046 |
|
|
|
ff6046 |
+ if (streq(machine, ".host")) {
|
|
|
ff6046 |
+ *pid = 1;
|
|
|
ff6046 |
+ return 0;
|
|
|
ff6046 |
+ }
|
|
|
ff6046 |
+
|
|
|
ff6046 |
if (!machine_name_is_valid(machine))
|
|
|
ff6046 |
return -EINVAL;
|
|
|
ff6046 |
|
|
|
ff6046 |
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
|
|
|
ff6046 |
index 7f03528b89..f53a98d6bf 100644
|
|
|
ff6046 |
--- a/src/libsystemd/sd-bus/sd-bus.c
|
|
|
ff6046 |
+++ b/src/libsystemd/sd-bus/sd-bus.c
|
|
|
ff6046 |
@@ -952,7 +952,7 @@ static int parse_container_unix_address(sd_bus *b, const char **p, char **guid)
|
|
|
ff6046 |
return -EINVAL;
|
|
|
ff6046 |
|
|
|
ff6046 |
if (machine) {
|
|
|
ff6046 |
- if (!machine_name_is_valid(machine))
|
|
|
ff6046 |
+ if (!streq(machine, ".host") && !machine_name_is_valid(machine))
|
|
|
ff6046 |
return -EINVAL;
|
|
|
ff6046 |
|
|
|
ff6046 |
free_and_replace(b->machine, machine);
|
|
|
ff6046 |
@@ -1450,7 +1450,7 @@ _public_ int sd_bus_open_system_machine(sd_bus **ret, const char *machine) {
|
|
|
ff6046 |
|
|
|
ff6046 |
assert_return(machine, -EINVAL);
|
|
|
ff6046 |
assert_return(ret, -EINVAL);
|
|
|
ff6046 |
- assert_return(machine_name_is_valid(machine), -EINVAL);
|
|
|
ff6046 |
+ assert_return(streq(machine, ".host") || machine_name_is_valid(machine), -EINVAL);
|
|
|
ff6046 |
|
|
|
ff6046 |
r = sd_bus_new(&b);
|
|
|
ff6046 |
if (r < 0)
|