SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #977 from richardmaw-codethink/machinectl-userns-login-v2

Browse Source 
Fix machinectl login with containers in user namespaces (v2)
This commit is contained in:
Lennart Poettering
2015-08-17 15:12:15 +02:00
parent aaa2a3abf9 671c341958
commit f90c90b4a1
6 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/logs-show.c
+2 -2
View File
@@ -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);