Skip to content

Commit

Permalink
mnt: reformat messages for PLOG
Browse files Browse the repository at this point in the history
  • Loading branch information
robertswiecki committed Oct 3, 2023
1 parent d99e530 commit ca29f29
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions mnt.cc
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,8 @@ static int mountRWIfPossible(mount_t* mpt, const char* src, const char* dst) {
int res =
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) {
LOG_W(
"mount('%s') src: '%s' dstpath: '%s' could not mount read-write, falling back "
"to mounting read-only directly",
LOG_W("mount('%s') src: '%s' dstpath: '%s' could not mount read-write, falling "
"back to mounting read-only directly",
describeMountPt(*mpt).c_str(), src, dst);
res = mount(src, dst, mpt->fs_type.c_str(), mpt->flags, mpt->options.c_str());
}
Expand Down Expand Up @@ -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",
describeMountPt(*mpt).c_str(), srcpath, dstpath);
if (mpt->fs_type.compare("proc") == 0) {
PLOG_W(
"procfs can only be mounted if the original /proc doesn't have "
"any other file-systems mounted on top of it (e.g. /dev/null "
"on top of /proc/kcore)");
PLOG_W("procfs can only be mounted if the original /proc doesn't "
"have any other file-systems mounted on top of it (e.g. "
"/dev/null on top of /proc/kcore)");
}
}
return false;
Expand Down

0 comments on commit ca29f29

Please sign in to comment.