diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-08-17 15:12:15 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-08-17 15:12:15 +0200 |
| commit | f90c90b4a17e75bdceb5ee2a656910cc1ca63f9a (patch) | |
| tree | c0ed59c1b51b9ba921d6789c6ef06136b19cdb4f /src/machine | |
| parent | aaa2a3abf9b3f027918b60fe0d0340fcd4874291 (diff) | |
| parent | 671c34195896e89f935d842b13f52a748bd8a5b4 (diff) | |
Merge pull request #977 from richardmaw-codethink/machinectl-userns-login-v2
Fix machinectl login with containers in user namespaces (v2)
Diffstat (limited to 'src/machine')
| -rw-r--r-- | src/machine/machine-dbus.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 7658d7146d..b62a9bd813 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -212,7 +212,7 @@ int bus_machine_method_get_addresses(sd_bus_message *message, void *userdata, sd if (streq(us, them)) return sd_bus_error_setf(error, BUS_ERROR_NO_PRIVATE_NETWORKING, "Machine %s does not use private networking", m->name); - r = namespace_open(m->leader, NULL, NULL, &netns_fd, NULL); + r = namespace_open(m->leader, NULL, NULL, &netns_fd, NULL, NULL); if (r < 0) return r; @@ -230,7 +230,7 @@ int bus_machine_method_get_addresses(sd_bus_message *message, void *userdata, sd pair[0] = safe_close(pair[0]); - r = namespace_enter(-1, -1, netns_fd, -1); + r = namespace_enter(-1, -1, netns_fd, -1, -1); if (r < 0) _exit(EXIT_FAILURE); @@ -346,7 +346,7 @@ int bus_machine_method_get_os_release(sd_bus_message *message, void *userdata, s if (m->class != MACHINE_CONTAINER) return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "Requesting OS release data is only supported on container machines."); - r = namespace_open(m->leader, NULL, &mntns_fd, NULL, &root_fd); + r = namespace_open(m->leader, NULL, &mntns_fd, NULL, NULL, &root_fd); if (r < 0) return r; @@ -362,7 +362,7 @@ int bus_machine_method_get_os_release(sd_bus_message *message, void *userdata, s pair[0] = safe_close(pair[0]); - r = namespace_enter(-1, mntns_fd, -1, root_fd); + r = namespace_enter(-1, mntns_fd, -1, -1, root_fd); if (r < 0) _exit(EXIT_FAILURE); |