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/shared | |
| parent | aaa2a3abf9b3f027918b60fe0d0340fcd4874291 (diff) | |
| parent | 671c34195896e89f935d842b13f52a748bd8a5b4 (diff) | |
| download | systemd-f90c90b4a17e75bdceb5ee2a656910cc1ca63f9a.tar.gz systemd-f90c90b4a17e75bdceb5ee2a656910cc1ca63f9a.tar.bz2 systemd-f90c90b4a17e75bdceb5ee2a656910cc1ca63f9a.zip | |
Merge pull request #977 from richardmaw-codethink/machinectl-userns-login-v2
Fix machinectl login with containers in user namespaces (v2)
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/logs-show.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index 068da465d9..b78cb7678c 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -1141,7 +1141,7 @@ static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) { if (r < 0) return r; - r = namespace_open(pid, &pidnsfd, &mntnsfd, NULL, &rootfd); + r = namespace_open(pid, &pidnsfd, &mntnsfd, NULL, NULL, &rootfd); if (r < 0) return r; @@ -1157,7 +1157,7 @@ static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) { pair[0] = safe_close(pair[0]); - r = namespace_enter(pidnsfd, mntnsfd, -1, rootfd); + r = namespace_enter(pidnsfd, mntnsfd, -1, -1, rootfd); if (r < 0) _exit(EXIT_FAILURE); |