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/core | |
| 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/core')
| -rw-r--r-- | src/core/machine-id-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c index 8e26362546..2d5ae3b3b9 100644 --- a/src/core/machine-id-setup.c +++ b/src/core/machine-id-setup.c @@ -325,7 +325,7 @@ int machine_id_commit(const char *root) { fd = safe_close(fd); /* Store current mount namespace */ - r = namespace_open(0, NULL, &initial_mntns_fd, NULL, NULL); + r = namespace_open(0, NULL, &initial_mntns_fd, NULL, NULL, NULL); if (r < 0) return log_error_errno(r, "Can't fetch current mount namespace: %m"); @@ -351,7 +351,7 @@ int machine_id_commit(const char *root) { fd = safe_close(fd); /* Return to initial namespace and proceed a lazy tmpfs unmount */ - r = namespace_enter(-1, initial_mntns_fd, -1, -1); + r = namespace_enter(-1, initial_mntns_fd, -1, -1, -1); if (r < 0) return log_warning_errno(r, "Failed to switch back to initial mount namespace: %m.\nWe'll keep transient %s file until next reboot.", etc_machine_id); |