diff options
| -rw-r--r-- | src/core/namespace.c | 5 | ||||
| -rw-r--r-- | src/initctl/initctl.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/namespace.c b/src/core/namespace.c index de09e9f2c3..16540043ab 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -143,7 +143,7 @@ static int mount_dev(BindMount *m) { "/dev/tty\0"; char temporary_mount[] = "/tmp/namespace-dev-XXXXXX"; - const char *d, *dev = NULL, *devpts = NULL, *devshm = NULL, *devkdbus = NULL, *devhugepages = NULL, *devmqueue = NULL; + const char *d, *dev = NULL, *devpts = NULL, *devshm = NULL, *devkdbus = NULL, *devhugepages = NULL, *devmqueue = NULL, *devlog = NULL; _cleanup_umask_ mode_t u; int r; @@ -188,6 +188,9 @@ static int mount_dev(BindMount *m) { mkdir(devhugepages, 0755); mount("/dev/hugepages", devhugepages, NULL, MS_BIND, NULL); + devlog = strappenda(temporary_mount, "/dev/log"); + symlink("/run/systemd/journal/dev-log", devlog); + NULSTR_FOREACH(d, devnodes) { _cleanup_free_ char *dn = NULL; struct stat st; diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c index f9a6ed44ed..f3f6f73040 100644 --- a/src/initctl/initctl.c +++ b/src/initctl/initctl.c @@ -383,7 +383,8 @@ int main(int argc, char *argv[]) { umask(0022); - if ((n = sd_listen_fds(true)) < 0) { + n = sd_listen_fds(true); + if (n < 0) { log_error("Failed to read listening file descriptors from environment: %s", strerror(-r)); return EXIT_FAILURE; } |