proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-15 06:06:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2377 from 2xsec/bugfix

Browse Source 
conf: change some logs to print errno
This commit is contained in:
Christian Brauner 2018-06-05 10:53:16 +02:00 committed by GitHub
commit 06b44d05bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lxc/conf.c
View File

@ -3186,26 +3186,28 @@ void remount_all_slave(void)
char *line = NULL;
mntinfo_fd = open("/proc/self/mountinfo", O_RDONLY | O_CLOEXEC);
if (mntinfo_fd < 0)
if (mntinfo_fd < 0) {
SYSERROR("Failed to open \"/proc/self/mountinfo\"");
return;
}
memfd = memfd_create(".lxc_mountinfo", MFD_CLOEXEC);
if (memfd < 0) {
char template[] = P_tmpdir "/.lxc_mountinfo_XXXXXX";
if (errno != ENOSYS) {
SYSERROR("Failed to create temporary in-memory file");
close(mntinfo_fd);
WARN("Failed to create temporary in-memory file");
return;
}
memfd = lxc_make_tmpfile(template, true);
}
if (memfd < 0) {
close(mntinfo_fd);
WARN("Failed to create temporary file");
return;
}
}
#define __LXC_SENDFILE_MAX 0x7ffff000 /* maximum number of bytes sendfile can handle */
again:
@ -3214,9 +3216,9 @@ again:
if (errno == EINTR)
goto again;
SYSERROR("Failed to copy \"/proc/self/mountinfo\"");
close(mntinfo_fd);
close(memfd);
WARN("Failed to copy \"/proc/self/mountinfo\"");
return;
}
close(mntinfo_fd);
@ -3226,14 +3228,14 @@ again:
*/
ret = lseek(memfd, 0, SEEK_SET);
if (ret < 0) {
SYSERROR("Failed to reset file descriptor offset");
close(memfd);
WARN("%s - Failed to reset file descriptor offset", strerror(errno));
return;
}
f = fdopen(memfd, "r");
if (!f) {
WARN("Failed to open copy of \"/proc/self/mountinfo\" to mark "
SYSERROR("Failed to open copy of \"/proc/self/mountinfo\" to mark "
"all shared. Continuing");
close(memfd);
return;