X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnspawn.c;h=b5908d63fffc4320e179778900f35873fb021bb2;hp=f8a190097ae1d0f1433a88833988f2a5b4837d71;hb=91f9dcaf9270fe465525638cc08bd94590273349;hpb=a258bf2648fa5e3005b96203c60b9751807bacf0 diff --git a/src/nspawn.c b/src/nspawn.c index f8a190097..b5908d63f 100644 --- a/src/nspawn.c +++ b/src/nspawn.c @@ -117,7 +117,7 @@ static int mount_all(const char *dest) { { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true }, { "tmpfs", "/dev", "tmpfs", "mode=755", MS_NOSUID, true }, { "/dev/pts", "/dev/pts", "bind", NULL, MS_BIND, true }, - { "tmpfs", "/dev/.run", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, + { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV, true }, #ifdef HAVE_SELINUX { "selinux", "/selinux", "selinuxfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false }, #endif @@ -125,9 +125,9 @@ static int mount_all(const char *dest) { unsigned k; int r = 0; + char *where; for (k = 0; k < ELEMENTSOF(mount_table); k++) { - char *where; int t; if (asprintf(&where, "%s/%s", dest, mount_table[k].where) < 0) { @@ -167,6 +167,13 @@ static int mount_all(const char *dest) { free(where); } + /* Fix the timezone, if possible */ + if (asprintf(&where, "%s/%s", dest, "/etc/localtime") >= 0) { + mount("/etc/localtime", where, "bind", MS_BIND, NULL); + mount("/etc/localtime", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL); + free(where); + } + return r; } @@ -367,11 +374,11 @@ static int is_os_tree(const char *path) { #define BUFFER_SIZE 1024 static int process_pty(int master, sigset_t *mask) { + char in_buffer[BUFFER_SIZE], out_buffer[BUFFER_SIZE]; size_t in_buffer_full = 0, out_buffer_full = 0; struct epoll_event stdin_ev, stdout_ev, master_ev, signal_ev; bool stdin_readable = false, stdout_writable = false, master_readable = false, master_writable = false; - bool stdin_rhup = false, stdout_whup = false, master_rhup = false, master_whup = false; int ep = -1, signal_fd = -1, r; fd_nonblock(STDIN_FILENO, 1); @@ -415,7 +422,7 @@ static int process_pty(int master, sigset_t *mask) { goto finish; } - do { + for (;;) { struct epoll_event ev[16]; ssize_t k; int i, nfds; @@ -435,30 +442,20 @@ static int process_pty(int master, sigset_t *mask) { for (i = 0; i < nfds; i++) { if (ev[i].data.fd == STDIN_FILENO) { - if (!stdin_rhup && (ev[i].events & (EPOLLHUP|EPOLLIN))) + if (ev[i].events & (EPOLLIN|EPOLLHUP)) stdin_readable = true; } else if (ev[i].data.fd == STDOUT_FILENO) { - if (ev[i].events & EPOLLHUP) { - stdout_writable = false; - stdout_whup = true; - } - - if (!stdout_whup && (ev[i].events & EPOLLOUT)) + if (ev[i].events & (EPOLLOUT|EPOLLHUP)) stdout_writable = true; } else if (ev[i].data.fd == master) { - /* We don't connect EPOLLHUP to - * master_whup here, since EPOLLHUP - * can happen when noone has opened - * the other side */ - - if (!master_rhup && (ev[i].events & (EPOLLHUP|EPOLLIN))) + if (ev[i].events & (EPOLLIN|EPOLLHUP)) master_readable = true; - if (!master_whup && (ev[i].events & EPOLLOUT)) + if (ev[i].events & (EPOLLOUT|EPOLLHUP)) master_writable = true; } else if (ev[i].data.fd == signal_fd) { @@ -468,11 +465,13 @@ static int process_pty(int master, sigset_t *mask) { if ((n = read(signal_fd, &sfsi, sizeof(sfsi))) != sizeof(sfsi)) { if (n >= 0) { + log_error("Failed to read from signalfd: invalid block size"); r = -EIO; goto finish; } if (errno != EINTR && errno != EAGAIN) { + log_error("Failed to read from signalfd: %m"); r = -errno; goto finish; } @@ -482,11 +481,10 @@ static int process_pty(int master, sigset_t *mask) { struct winsize ws; /* The window size changed, let's forward that. */ - if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) >= 0) ioctl(master, TIOCSWINSZ, &ws); } else { - r = -EINTR; + r = 0; goto finish; } } @@ -502,35 +500,26 @@ static int process_pty(int master, sigset_t *mask) { if ((k = read(STDIN_FILENO, in_buffer + in_buffer_full, BUFFER_SIZE - in_buffer_full)) < 0) { - if (errno == EAGAIN) + if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO) stdin_readable = false; - else if (errno == EPIPE || errno == ECONNRESET || errno == EIO) - k = 0; else { log_error("read(): %m"); + r = -errno; goto finish; } } else in_buffer_full += (size_t) k; - - if (k == 0) { - stdin_rhup = true; - stdin_readable = false; - shutdown(STDIN_FILENO, SHUT_RD); - } } if (master_writable && in_buffer_full > 0) { if ((k = write(master, in_buffer, in_buffer_full)) < 0) { - if (errno == EAGAIN) + if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO) master_writable = false; - else if (errno == EPIPE || errno == ECONNRESET || errno == EIO) { - master_whup = true; - master_writable = false; - } else { + else { log_error("write(): %m"); + r = -errno; goto finish; } @@ -545,34 +534,26 @@ static int process_pty(int master, sigset_t *mask) { if ((k = read(master, out_buffer + out_buffer_full, BUFFER_SIZE - out_buffer_full)) < 0) { - if (errno == EAGAIN) + if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO) master_readable = false; - else if (errno == EPIPE || errno == ECONNRESET || errno == EIO) - k = 0; else { log_error("read(): %m"); + r = -errno; goto finish; } } else out_buffer_full += (size_t) k; - - if (k == 0) { - master_rhup = true; - master_readable = false; - } } if (stdout_writable && out_buffer_full > 0) { if ((k = write(STDOUT_FILENO, out_buffer, out_buffer_full)) < 0) { - if (errno == EAGAIN) + if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO) stdout_writable = false; - else if (errno == EPIPE || errno == ECONNRESET || errno == EIO) { - stdout_whup = true; - stdout_writable = false; - } else { + else { log_error("write(): %m"); + r = -errno; goto finish; } @@ -583,19 +564,7 @@ static int process_pty(int master, sigset_t *mask) { } } } - - if (stdin_rhup && in_buffer_full <= 0 && !master_whup) { - master_whup = true; - master_writable = false; - } - - if (master_rhup && out_buffer_full <= 0 && !stdout_whup) { - stdout_whup = true; - stdout_writable = false; - shutdown(STDOUT_FILENO, SHUT_WR); - } - - } while (!stdout_whup || !master_whup); + } finish: if (ep >= 0)