Merge pull request #5333 from poettering/machined-copy-files-userns

machined userns fixes
This commit is contained in:
Lennart Poettering
2017-02-17 13:51:58 +01:00
committed by GitHub
26 changed files with 381 additions and 109 deletions
+2 -2
View File
@@ -1340,11 +1340,11 @@ static int usbffs_write_descs(int fd, Service *s) {
if (!s->usb_function_descriptors || !s->usb_function_strings)
return -EINVAL;
r = copy_file_fd(s->usb_function_descriptors, fd, false);
r = copy_file_fd(s->usb_function_descriptors, fd, 0);
if (r < 0)
return r;
return copy_file_fd(s->usb_function_strings, fd, false);
return copy_file_fd(s->usb_function_strings, fd, 0);
}
static int usbffs_select_ep(const struct dirent *d) {