X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnspawn%2Fnspawn.c;h=7b1b5eab846eb1660fb3b176dcbd0ee6495557d8;hp=fec39d644875e816a11ea1468414dd7638fb47b8;hb=3eabccc46c003d129a847ba423a6d0ba778e4930;hpb=d2e54fae5ca7a0f71b5ac8b356a589ff0a09ea0a diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index fec39d644..7b1b5eab8 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -52,6 +52,15 @@ #include "strv.h" #include "path-util.h" #include "loopback-setup.h" +#include "sd-id128.h" +#include "dev-setup.h" + +typedef enum LinkJournal { + LINK_NO, + LINK_AUTO, + LINK_HOST, + LINK_GUEST +} LinkJournal; static char *arg_directory = NULL; static char *arg_user = NULL; @@ -60,19 +69,46 @@ static char *arg_uuid = NULL; static bool arg_private_network = false; static bool arg_read_only = false; static bool arg_boot = false; +static LinkJournal arg_link_journal = LINK_AUTO; +static uint64_t arg_retain = + (1ULL << CAP_CHOWN) | + (1ULL << CAP_DAC_OVERRIDE) | + (1ULL << CAP_DAC_READ_SEARCH) | + (1ULL << CAP_FOWNER) | + (1ULL << CAP_FSETID) | + (1ULL << CAP_IPC_OWNER) | + (1ULL << CAP_KILL) | + (1ULL << CAP_LEASE) | + (1ULL << CAP_LINUX_IMMUTABLE) | + (1ULL << CAP_NET_BIND_SERVICE) | + (1ULL << CAP_NET_BROADCAST) | + (1ULL << CAP_NET_RAW) | + (1ULL << CAP_SETGID) | + (1ULL << CAP_SETFCAP) | + (1ULL << CAP_SETPCAP) | + (1ULL << CAP_SETUID) | + (1ULL << CAP_SYS_ADMIN) | + (1ULL << CAP_SYS_CHROOT) | + (1ULL << CAP_SYS_NICE) | + (1ULL << CAP_SYS_PTRACE) | + (1ULL << CAP_SYS_TTY_CONFIG) | + (1ULL << CAP_SYS_RESOURCE); static int help(void) { printf("%s [OPTIONS...] [PATH] [ARGUMENTS...]\n\n" "Spawn a minimal namespace container for debugging, testing and building.\n\n" - " -h --help Show this help\n" - " -D --directory=NAME Root directory for the container\n" - " -b --boot Boot up full system (i.e. invoke init)\n" - " -u --user=USER Run the command under specified user or uid\n" - " -C --controllers=LIST Put the container in specified comma-separated cgroup hierarchies\n" - " --uuid=UUID Set a specific machine UUID for the container\n" - " --private-network Disable network in container\n" - " --read-only Mount the root directory read-only\n", + " -h --help Show this help\n" + " -D --directory=NAME Root directory for the container\n" + " -b --boot Boot up full system (i.e. invoke init)\n" + " -u --user=USER Run the command under specified user or uid\n" + " -C --controllers=LIST Put the container in specified comma-separated cgroup hierarchies\n" + " --uuid=UUID Set a specific machine UUID for the container\n" + " --private-network Disable network in container\n" + " --read-only Mount the root directory read-only\n" + " --capability=CAP In addition to the default, retain specified capability\n" + " --link-journal=MODE Link up guest journal, one of no, auto, guest, host\n" + " -j Equivalent to --link-journal=host\n", program_invocation_short_name); return 0; @@ -83,7 +119,9 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_PRIVATE_NETWORK = 0x100, ARG_UUID, - ARG_READ_ONLY + ARG_READ_ONLY, + ARG_CAPABILITY, + ARG_LINK_JOURNAL }; static const struct option options[] = { @@ -95,6 +133,8 @@ static int parse_argv(int argc, char *argv[]) { { "boot", no_argument, NULL, 'b' }, { "uuid", required_argument, NULL, ARG_UUID }, { "read-only", no_argument, NULL, ARG_READ_ONLY }, + { "capability", required_argument, NULL, ARG_CAPABILITY }, + { "link-journal", required_argument, NULL, ARG_LINK_JOURNAL }, { NULL, 0, NULL, 0 } }; @@ -103,7 +143,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "+hD:u:C:b", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "+hD:u:C:bj", options, NULL)) >= 0) { switch (c) { @@ -157,6 +197,51 @@ static int parse_argv(int argc, char *argv[]) { arg_read_only = true; break; + case ARG_CAPABILITY: { + char *state, *word; + size_t length; + + FOREACH_WORD_SEPARATOR(word, length, optarg, ",", state) { + cap_value_t cap; + char *t; + + t = strndup(word, length); + if (!t) + return log_oom(); + + if (cap_from_name(t, &cap) < 0) { + log_error("Failed to parse capability %s.", t); + free(t); + return -EINVAL; + } + + free(t); + arg_retain |= 1ULL << (uint64_t) cap; + } + + break; + } + + case 'j': + arg_link_journal = LINK_GUEST; + break; + + case ARG_LINK_JOURNAL: + if (streq(optarg, "auto")) + arg_link_journal = LINK_AUTO; + else if (streq(optarg, "no")) + arg_link_journal = LINK_NO; + else if (streq(optarg, "guest")) + arg_link_journal = LINK_GUEST; + else if (streq(optarg, "host")) + arg_link_journal = LINK_HOST; + else { + log_error("Failed to parse link journal mode %s", optarg); + return -EINVAL; + } + + break; + case '?': return -EINVAL; @@ -182,16 +267,15 @@ static int mount_all(const char *dest) { static const MountPoint mount_table[] = { { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, - { "/proc/sys", "/proc/sys", "bind", NULL, MS_BIND, true }, /* Bind mount first */ - { "/proc/sys", "/proc/sys", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, true }, /* Then, make it r/o */ - { "/sys", "/sys", "bind", NULL, MS_BIND, true }, /* Bind mount first */ - { "/sys", "/sys", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, true }, /* Then, make it r/o */ + { "/proc/sys", "/proc/sys", NULL, NULL, MS_BIND, true }, /* Bind mount first */ + { NULL, "/proc/sys", NULL, NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, true }, /* Then, make it r/o */ + { "sysfs", "/sys", "sysfs", NULL, MS_RDONLY|MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, { "tmpfs", "/dev", "tmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true }, - { "/dev/pts", "/dev/pts", "bind", NULL, MS_BIND, true }, + { "/dev/pts", "/dev/pts", NULL, NULL, MS_BIND, true }, { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true }, #ifdef HAVE_SELINUX - { "/sys/fs/selinux", "/sys/fs/selinux", "bind", NULL, MS_BIND, false }, /* Bind mount first */ - { "/sys/fs/selinux", "/sys/fs/selinux", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, false }, /* Then, make it r/o */ + { "/sys/fs/selinux", "/sys/fs/selinux", NULL, NULL, MS_BIND, false }, /* Bind mount first */ + { NULL, "/sys/fs/selinux", NULL, NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, false }, /* Then, make it r/o */ #endif }; @@ -203,7 +287,7 @@ static int mount_all(const char *dest) { int t; if (asprintf(&where, "%s/%s", dest, mount_table[k].where) < 0) { - log_error("Out of memory"); + log_oom(); if (r == 0) r = -ENOMEM; @@ -211,7 +295,7 @@ static int mount_all(const char *dest) { break; } - t = path_is_mount_point(where, false); + t = path_is_mount_point(where, true); if (t < 0) { log_error("Failed to detect whether %s is a mount point: %s", where, strerror(-t)); free(where); @@ -222,6 +306,10 @@ static int mount_all(const char *dest) { continue; } + /* Skip this entry if it is not a remount. */ + if (mount_table[k].what && t > 0) + continue; + mkdir_p_label(where, 0755); if (mount(mount_table[k].what, @@ -249,20 +337,18 @@ static int setup_timezone(const char *dest) { assert(dest); /* Fix the timezone, if possible */ - if (asprintf(&where, "%s/etc/localtime", dest) < 0) { - log_error("Out of memory"); - return -ENOMEM; - } + where = strappend(dest, "/etc/localtime"); + if (!where) + return log_oom(); if (mount("/etc/localtime", where, "bind", MS_BIND, NULL) >= 0) mount("/etc/localtime", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL); free(where); - if (asprintf(&where, "%s/etc/timezone", dest) < 0) { - log_error("Out of memory"); - return -ENOMEM; - } + where = strappend(dest, "/etc/timezone"); + if (!where) + return log_oom(); if (mount("/etc/timezone", where, "bind", MS_BIND, NULL) >= 0) mount("/etc/timezone", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL); @@ -281,10 +367,9 @@ static int setup_resolv_conf(const char *dest) { return 0; /* Fix resolv.conf, if possible */ - if (asprintf(&where, "%s/etc/resolv.conf", dest) < 0) { - log_error("Out of memory"); - return -ENOMEM; - } + where = strappend(dest, "/etc/resolv.conf"); + if (!where) + return log_oom(); if (mount("/etc/resolv.conf", where, "bind", MS_BIND, NULL) >= 0) mount("/etc/resolv.conf", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL); @@ -294,6 +379,61 @@ static int setup_resolv_conf(const char *dest) { return 0; } +static int setup_boot_id(const char *dest) { + char *from = NULL, *to = NULL; + sd_id128_t rnd; + char as_uuid[37]; + int r; + + assert(dest); + + /* Generate a new randomized boot ID, so that each boot-up of + * the container gets a new one */ + + from = strappend(dest, "/dev/proc-sys-kernel-random-boot-id"); + if (!from) { + r = log_oom(); + goto finish; + } + + to = strappend(dest, "/proc/sys/kernel/random/boot_id"); + if (!to) { + r = log_oom(); + goto finish; + } + + r = sd_id128_randomize(&rnd); + if (r < 0) { + log_error("Failed to generate random boot id: %s", strerror(-r)); + goto finish; + } + + snprintf(as_uuid, sizeof(as_uuid), + "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", + SD_ID128_FORMAT_VAL(rnd)); + char_array_0(as_uuid); + + r = write_one_line_file(from, as_uuid); + if (r < 0) { + log_error("Failed to write boot id: %s", strerror(-r)); + goto finish; + } + + if (mount(from, to, "bind", MS_BIND, NULL) < 0) { + log_error("Failed to bind mount boot id: %m"); + r = -errno; + } else + mount(from, to, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL); + + unlink(from); + +finish: + free(from); + free(to); + + return r; +} + static int copy_devnodes(const char *dest) { static const char devnodes[] = @@ -303,8 +443,7 @@ static int copy_devnodes(const char *dest) { "random\0" "urandom\0" "tty\0" - "ptmx\0" - "rtc0\0"; + "ptmx\0"; const char *d; int r = 0; @@ -394,8 +533,7 @@ static int setup_dev_console(const char *dest, const char *console) { } if (asprintf(&to, "%s/dev/console", dest) < 0) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } @@ -449,14 +587,12 @@ static int setup_kmsg(const char *dest, int kmsg_socket) { * avoid any problems with containers deadlocking due to this * we simply make /dev/kmsg unavailable to the container. */ if (asprintf(&from, "%s/dev/kmsg", dest) < 0) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } if (asprintf(&to, "%s/proc/kmsg", dest) < 0) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; } @@ -543,32 +679,155 @@ static int setup_hostname(void) { return r; } -static int drop_capabilities(void) { +static int setup_journal(const char *directory) { + sd_id128_t machine_id; + char *p = NULL, *b = NULL, *l, *q = NULL, *d = NULL; + int r; + + if (arg_link_journal == LINK_NO) + return 0; + + p = strappend(directory, "/etc/machine-id"); + if (!p) { + r = log_oom(); + goto finish; + } + + r = read_one_line_file(p, &b); + if (r == -ENOENT && arg_link_journal == LINK_AUTO) { + r = 0; + goto finish; + } else if (r < 0) { + log_error("Failed to read machine ID: %s", strerror(-r)); + return r; + } - static const uint64_t retain = - (1ULL << CAP_CHOWN) | - (1ULL << CAP_DAC_OVERRIDE) | - (1ULL << CAP_DAC_READ_SEARCH) | - (1ULL << CAP_FOWNER) | - (1ULL << CAP_FSETID) | - (1ULL << CAP_IPC_OWNER) | - (1ULL << CAP_KILL) | - (1ULL << CAP_LEASE) | - (1ULL << CAP_LINUX_IMMUTABLE) | - (1ULL << CAP_NET_BIND_SERVICE) | - (1ULL << CAP_NET_BROADCAST) | - (1ULL << CAP_NET_RAW) | - (1ULL << CAP_SETGID) | - (1ULL << CAP_SETFCAP) | - (1ULL << CAP_SETPCAP) | - (1ULL << CAP_SETUID) | - (1ULL << CAP_SYS_ADMIN) | - (1ULL << CAP_SYS_CHROOT) | - (1ULL << CAP_SYS_NICE) | - (1ULL << CAP_SYS_PTRACE) | - (1ULL << CAP_SYS_TTY_CONFIG); - - return capability_bounding_set_drop(~retain, false); + l = strstrip(b); + if (isempty(l) && arg_link_journal == LINK_AUTO) { + r = 0; + goto finish; + } + + /* Verify validaty */ + r = sd_id128_from_string(l, &machine_id); + if (r < 0) { + log_error("Failed to parse machine ID: %s", strerror(-r)); + goto finish; + } + + free(p); + p = strappend("/var/log/journal/", l); + q = strjoin(directory, "/var/log/journal/", l, NULL); + if (!p || !q) { + r = log_oom(); + goto finish; + } + + if (path_is_mount_point(p, false) > 0 || + path_is_mount_point(q, false) > 0) { + if (arg_link_journal != LINK_AUTO) { + log_error("Journal already a mount point, refusing."); + r = -EEXIST; + goto finish; + } + + r = 0; + goto finish; + } + + r = readlink_and_make_absolute(p, &d); + if (r >= 0) { + if ((arg_link_journal == LINK_GUEST || + arg_link_journal == LINK_AUTO) && + path_equal(d, q)) { + + mkdir_p(q, 0755); + + r = 0; + goto finish; + } + + if (unlink(p) < 0) { + log_error("Failed to remove symlink %s: %m", p); + r = -errno; + goto finish; + } + } else if (r == -EINVAL) { + + if (arg_link_journal == LINK_GUEST && + rmdir(p) < 0) { + + if (errno == ENOTDIR) + log_error("%s already exists and is neither symlink nor directory.", p); + else { + log_error("Failed to remove %s: %m", p); + r = -errno; + } + + goto finish; + } + } else if (r != -ENOENT) { + log_error("readlink(%s) failed: %m", p); + goto finish; + } + + if (arg_link_journal == LINK_GUEST) { + + if (symlink(q, p) < 0) { + log_error("Failed to symlink %s to %s: %m", q, p); + r = -errno; + goto finish; + } + + mkdir_p(q, 0755); + + r = 0; + goto finish; + } + + if (arg_link_journal == LINK_HOST) { + r = mkdir_p(p, 0755); + if (r < 0) { + log_error("Failed to create %s: %m", p); + goto finish; + } + + } else if (access(p, F_OK) < 0) { + r = 0; + goto finish; + } + + if (dir_is_empty(q) == 0) { + log_error("%s not empty.", q); + r = -ENOTEMPTY; + goto finish; + } + + r = mkdir_p(q, 0755); + if (r < 0) { + log_error("Failed to create %s: %m", q); + goto finish; + } + + if (mount(p, q, "bind", MS_BIND, NULL) < 0) { + log_error("Failed to bind mount journal from host into guest: %m"); + r = -errno; + goto finish; + } + + r = 0; + +finish: + free(p); + free(q); + free(d); + free(b); + return r; + +} + +static int drop_capabilities(void) { + return capability_bounding_set_drop(~arg_retain, false); } static int is_os_tree(const char *path) { @@ -597,13 +856,15 @@ static int process_pty(int master, sigset_t *mask) { fd_nonblock(STDOUT_FILENO, 1); fd_nonblock(master, 1); - if ((signal_fd = signalfd(-1, mask, SFD_NONBLOCK|SFD_CLOEXEC)) < 0) { + signal_fd = signalfd(-1, mask, SFD_NONBLOCK|SFD_CLOEXEC); + if (signal_fd < 0) { log_error("signalfd(): %m"); r = -errno; goto finish; } - if ((ep = epoll_create1(EPOLL_CLOEXEC)) < 0) { + ep = epoll_create1(EPOLL_CLOEXEC); + if (ep < 0) { log_error("Failed to create epoll: %m"); r = -errno; goto finish; @@ -639,7 +900,8 @@ static int process_pty(int master, sigset_t *mask) { ssize_t k; int i, nfds; - if ((nfds = epoll_wait(ep, ev, ELEMENTSOF(ev), -1)) < 0) { + nfds = epoll_wait(ep, ev, ELEMENTSOF(ev), -1); + if (nfds < 0) { if (errno == EINTR || errno == EAGAIN) continue; @@ -674,7 +936,8 @@ static int process_pty(int master, sigset_t *mask) { struct signalfd_siginfo sfsi; ssize_t n; - if ((n = read(signal_fd, &sfsi, sizeof(sfsi))) != sizeof(sfsi)) { + n = read(signal_fd, &sfsi, sizeof(sfsi)); + if (n != sizeof(sfsi)) { if (n >= 0) { log_error("Failed to read from signalfd: invalid block size"); @@ -710,7 +973,8 @@ static int process_pty(int master, sigset_t *mask) { if (stdin_readable && in_buffer_full < LINE_MAX) { - if ((k = read(STDIN_FILENO, in_buffer + in_buffer_full, LINE_MAX - in_buffer_full)) < 0) { + k = read(STDIN_FILENO, in_buffer + in_buffer_full, LINE_MAX - in_buffer_full); + if (k < 0) { if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO) stdin_readable = false; @@ -725,7 +989,8 @@ static int process_pty(int master, sigset_t *mask) { if (master_writable && in_buffer_full > 0) { - if ((k = write(master, in_buffer, in_buffer_full)) < 0) { + k = write(master, in_buffer, in_buffer_full); + if (k < 0) { if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO) master_writable = false; @@ -744,7 +1009,8 @@ static int process_pty(int master, sigset_t *mask) { if (master_readable && out_buffer_full < LINE_MAX) { - if ((k = read(master, out_buffer + out_buffer_full, LINE_MAX - out_buffer_full)) < 0) { + k = read(master, out_buffer + out_buffer_full, LINE_MAX - out_buffer_full); + if (k < 0) { if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO) master_readable = false; @@ -759,7 +1025,8 @@ static int process_pty(int master, sigset_t *mask) { if (stdout_writable && out_buffer_full > 0) { - if ((k = write(STDOUT_FILENO, out_buffer, out_buffer_full)) < 0) { + k = write(STDOUT_FILENO, out_buffer, out_buffer_full); + if (k < 0) { if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO) stdout_writable = false; @@ -804,7 +1071,8 @@ int main(int argc, char *argv[]) { log_parse_environment(); log_open(); - if ((r = parse_argv(argc, argv)) <= 0) + r = parse_argv(argc, argv); + if (r <= 0) goto finish; if (arg_directory) { @@ -843,7 +1111,8 @@ int main(int argc, char *argv[]) { goto finish; } - if ((k = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 0, &oldcg)) < 0) { + k = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 0, &oldcg); + if (k < 0) { log_error("Failed to determine current cgroup: %s", strerror(-k)); goto finish; } @@ -859,18 +1128,20 @@ int main(int argc, char *argv[]) { goto finish; } - STRV_FOREACH(controller,arg_controllers) { + STRV_FOREACH(controller, arg_controllers) { k = cg_create_and_attach(*controller, newcg, 0); if (k < 0) log_warning("Failed to create cgroup in controller %s: %s", *controller, strerror(-k)); } - if ((master = posix_openpt(O_RDWR|O_NOCTTY|O_CLOEXEC|O_NDELAY)) < 0) { + master = posix_openpt(O_RDWR|O_NOCTTY|O_CLOEXEC|O_NDELAY); + if (master < 0) { log_error("Failed to acquire pseudo tty: %m"); goto finish; } - if (!(console = ptsname(master))) { + console = ptsname(master); + if (!console) { log_error("Failed to determine tty name: %m"); goto finish; } @@ -952,24 +1223,37 @@ int main(int argc, char *argv[]) { assert_se(sigemptyset(&mask) == 0); assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0); - if (setsid() < 0) + if (open_terminal(console, O_RDWR) != STDIN_FILENO || + dup2(STDIN_FILENO, STDOUT_FILENO) != STDOUT_FILENO || + dup2(STDIN_FILENO, STDERR_FILENO) != STDERR_FILENO) + goto child_fail; + + if (setsid() < 0) { + log_error("setsid() failed: %m"); goto child_fail; + } - if (prctl(PR_SET_PDEATHSIG, SIGKILL) < 0) + if (prctl(PR_SET_PDEATHSIG, SIGKILL) < 0) { + log_error("PR_SET_PDEATHSIG failed: %m"); goto child_fail; + } - /* Mark / as private, in case somebody marked it shared */ - if (mount(NULL, "/", NULL, MS_PRIVATE|MS_REC, NULL) < 0) + /* Mark everything as slave, so that we still + * receive mounts from the real root, but don't + * propagate mounts to the real root. */ + if (mount(NULL, "/", NULL, MS_SLAVE|MS_REC, NULL) < 0) { + log_error("MS_SLAVE|MS_REC failed: %m"); goto child_fail; + } /* Turn directory into bind mount */ - if (mount(arg_directory, arg_directory, "bind", MS_BIND, NULL) < 0) { + if (mount(arg_directory, arg_directory, "bind", MS_BIND|MS_REC, NULL) < 0) { log_error("Failed to make bind mount."); goto child_fail; } if (arg_read_only) - if (mount(arg_directory, arg_directory, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) { + if (mount(arg_directory, arg_directory, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY|MS_REC, NULL) < 0) { log_error("Failed to make read-only."); goto child_fail; } @@ -980,6 +1264,8 @@ int main(int argc, char *argv[]) { if (copy_devnodes(arg_directory) < 0) goto child_fail; + dev_setup(arg_directory); + if (setup_dev_console(arg_directory, console) < 0) goto child_fail; @@ -988,24 +1274,25 @@ int main(int argc, char *argv[]) { close_nointr_nofail(kmsg_socket_pair[1]); + if (setup_boot_id(arg_directory) < 0) + goto child_fail; + if (setup_timezone(arg_directory) < 0) goto child_fail; if (setup_resolv_conf(arg_directory) < 0) goto child_fail; + if (setup_journal(arg_directory) < 0) + goto child_fail; + if (chdir(arg_directory) < 0) { log_error("chdir(%s) failed: %m", arg_directory); goto child_fail; } - if (open_terminal("dev/console", O_RDWR) != STDIN_FILENO || - dup2(STDIN_FILENO, STDOUT_FILENO) != STDOUT_FILENO || - dup2(STDIN_FILENO, STDERR_FILENO) != STDERR_FILENO) - goto child_fail; - - if (mount(arg_directory, "/", "bind", MS_MOVE, NULL) < 0) { - log_error("mount(MS_BIND) failed: %m"); + if (mount(arg_directory, "/", NULL, MS_MOVE, NULL) < 0) { + log_error("mount(MS_MOVE) failed: %m"); goto child_fail; } @@ -1030,7 +1317,7 @@ int main(int argc, char *argv[]) { if (arg_user) { - if (get_user_creds((const char**)&arg_user, &uid, &gid, &home) < 0) { + if (get_user_creds((const char**)&arg_user, &uid, &gid, &home, NULL) < 0) { log_error("get_user_creds() failed: %m"); goto child_fail; } @@ -1064,13 +1351,13 @@ int main(int argc, char *argv[]) { if ((asprintf((char**)(envp + 3), "HOME=%s", home ? home: "/root") < 0) || (asprintf((char**)(envp + 4), "USER=%s", arg_user ? arg_user : "root") < 0) || (asprintf((char**)(envp + 5), "LOGNAME=%s", arg_user ? arg_user : "root") < 0)) { - log_error("Out of memory"); + log_oom(); goto child_fail; } if (arg_uuid) { if (asprintf((char**)(envp + 6), "container_uuid=%s", arg_uuid) < 0) { - log_error("Out of memory"); + log_oom(); goto child_fail; } }