chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[elogind.git]
/
src
/
nspawn.c
diff --git
a/src/nspawn.c
b/src/nspawn.c
index 653d7db730a80361b08a2b002415c0cb2e6fcaa6..6f5a9d9547d52931fcd5d5d68aac244e6214c1c4 100644
(file)
--- a/
src/nspawn.c
+++ b/
src/nspawn.c
@@
-39,11
+39,12
@@
#include <grp.h>
#include <linux/fs.h>
#include <grp.h>
#include <linux/fs.h>
+#include <systemd/sd-daemon.h>
+
#include "log.h"
#include "util.h"
#include "missing.h"
#include "cgroup-util.h"
#include "log.h"
#include "util.h"
#include "missing.h"
#include "cgroup-util.h"
-#include "sd-daemon.h"
#include "strv.h"
#include "loopback-setup.h"
#include "strv.h"
#include "loopback-setup.h"
@@
-196,7
+197,7
@@
static int mount_all(const char *dest) {
}
/* Fix the timezone, if possible */
}
/* Fix the timezone, if possible */
- if (asprintf(&where, "%s/
%s", dest, "/etc/localtime"
) >= 0) {
+ if (asprintf(&where, "%s/
etc/localtime", dest
) >= 0) {
if (mount("/etc/localtime", where, "bind", MS_BIND, NULL) >= 0)
mount("/etc/localtime", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL);
if (mount("/etc/localtime", where, "bind", MS_BIND, NULL) >= 0)
mount("/etc/localtime", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL);
@@
-204,6
+205,14
@@
static int mount_all(const char *dest) {
free(where);
}
free(where);
}
+ if (asprintf(&where, "%s/etc/timezone", dest) >= 0) {
+
+ if (mount("/etc/timezone", where, "bind", MS_BIND, NULL) >= 0)
+ mount("/etc/timezone", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL);
+
+ free(where);
+ }
+
return r;
}
return r;
}
@@
-394,11
+403,9
@@
static int is_os_tree(const char *path) {
return r < 0 ? 0 : 1;
}
return r < 0 ? 0 : 1;
}
-#define BUFFER_SIZE 1024
-
static int process_pty(int master, sigset_t *mask) {
static int process_pty(int master, sigset_t *mask) {
- char in_buffer[
BUFFER_SIZE], out_buffer[BUFFER_SIZE
];
+ char in_buffer[
LINE_MAX], out_buffer[LINE_MAX
];
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;
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;
@@
-519,9
+526,9
@@
static int process_pty(int master, sigset_t *mask) {
(master_readable && out_buffer_full <= 0) ||
(stdout_writable && out_buffer_full > 0)) {
(master_readable && out_buffer_full <= 0) ||
(stdout_writable && out_buffer_full > 0)) {
- if (stdin_readable && in_buffer_full <
BUFFER_SIZE
) {
+ if (stdin_readable && in_buffer_full <
LINE_MAX
) {
- if ((k = read(STDIN_FILENO, in_buffer + in_buffer_full,
BUFFER_SIZE
- in_buffer_full)) < 0) {
+ if ((k = read(STDIN_FILENO, in_buffer + in_buffer_full,
LINE_MAX
- in_buffer_full)) < 0) {
if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO)
stdin_readable = false;
if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO)
stdin_readable = false;
@@
-553,9
+560,9
@@
static int process_pty(int master, sigset_t *mask) {
}
}
}
}
- if (master_readable && out_buffer_full <
BUFFER_SIZE
) {
+ if (master_readable && out_buffer_full <
LINE_MAX
) {
- if ((k = read(master, out_buffer + out_buffer_full,
BUFFER_SIZE
- out_buffer_full)) < 0) {
+ if ((k = read(master, out_buffer + out_buffer_full,
LINE_MAX
- out_buffer_full)) < 0) {
if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO)
master_readable = false;
if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO)
master_readable = false;
@@
-707,8
+714,13
@@
int main(int argc, char *argv[]) {
sigset_add_many(&mask, SIGCHLD, SIGWINCH, SIGTERM, SIGINT, -1);
assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
sigset_add_many(&mask, SIGCHLD, SIGWINCH, SIGTERM, SIGINT, -1);
assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
- if ((pid = syscall(__NR_clone, SIGCHLD|CLONE_NEWIPC|CLONE_NEWNS|CLONE_NEWPID|CLONE_NEWUTS|(arg_private_network ? CLONE_NEWNET : 0), NULL)) < 0) {
- log_error("clone() failed: %m");
+ pid = syscall(__NR_clone, SIGCHLD|CLONE_NEWIPC|CLONE_NEWNS|CLONE_NEWPID|CLONE_NEWUTS|(arg_private_network ? CLONE_NEWNET : 0), NULL);
+ if (pid < 0) {
+ if (errno == EINVAL)
+ log_error("clone() failed, do you have namespace support enabled in your kernel? (You need UTS, IPC, PID and NET namespacing built in): %m");
+ else
+ log_error("clone() failed: %m");
+
goto finish;
}
goto finish;
}