woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mnt: reformat messages for PLOG

Browse Source
This commit is contained in:
Robert Swiecki 2023-10-03 23:16:55 +02:00
parent d99e530134
commit ca29f292b6
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mnt.cc
View File

@ -132,9 +132,8 @@ static int mountRWIfPossible(mount_t* mpt, const char* src, const char* dst) {
int res = int res =
mount(src, dst, mpt->fs_type.c_str(), mpt->flags & ~(MS_RDONLY), mpt->options.c_str()); mount(src, dst, mpt->fs_type.c_str(), mpt->flags & ~(MS_RDONLY), mpt->options.c_str());
if ((mpt->flags & MS_RDONLY) && res == -1 && errno == EPERM) { if ((mpt->flags & MS_RDONLY) && res == -1 && errno == EPERM) {
LOG_W( LOG_W("mount('%s') src: '%s' dstpath: '%s' could not mount read-write, falling "
"mount('%s') src: '%s' dstpath: '%s' could not mount read-write, falling back " "back to mounting read-only directly",
"to mounting read-only directly",
describeMountPt(*mpt).c_str(), src, dst); describeMountPt(*mpt).c_str(), src, dst);
res = mount(src, dst, mpt->fs_type.c_str(), mpt->flags, mpt->options.c_str()); res = mount(src, dst, mpt->fs_type.c_str(), mpt->flags, mpt->options.c_str());
} }
@ -222,10 +221,9 @@ static bool mountPt(mount_t* mpt, const char* newroot, const char* tmpdir) {
PLOG_W("mount('%s') src:'%s' dstpath:'%s' failed", PLOG_W("mount('%s') src:'%s' dstpath:'%s' failed",
describeMountPt(*mpt).c_str(), srcpath, dstpath); describeMountPt(*mpt).c_str(), srcpath, dstpath);
if (mpt->fs_type.compare("proc") == 0) { if (mpt->fs_type.compare("proc") == 0) {
PLOG_W( PLOG_W("procfs can only be mounted if the original /proc doesn't "
"procfs can only be mounted if the original /proc doesn't have " "have any other file-systems mounted on top of it (e.g. "
"any other file-systems mounted on top of it (e.g. /dev/null " "/dev/null on top of /proc/kcore)");
"on top of /proc/kcore)");
} }
} }
return false; return false;