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

mount: fewer warnings in a mount pt is non-mandatory #2

Browse Source
This commit is contained in:
Robert Swiecki 2017-05-28 14:53:16 +02:00
parent adc14c6f18
commit 1df9e9d2e1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mount.c
View File

@ -191,8 +191,13 @@ static bool mountRemountRO(struct mounts_t *mpt)
struct statvfs vfs;
if (TEMP_FAILURE_RETRY(statvfs(mpt->dst, &vfs)) == -1) {
PLOG_E("statvfs('%s')", mpt->dst);
return false;
if (mpt->mandatory) {
PLOG_E("statvfs('%s')", mpt->dst);
return false;
} else {
PLOG_D("statvfs('%s')", mpt->dst);
return true;
}
}
/*
* It's fine to use 'flags | vfs.f_flag' here as per
@ -206,10 +211,11 @@ static bool mountRemountRO(struct mounts_t *mpt)
mountFlagsToStr(vfs.f_flag), mountFlagsToStr(new_flags));
if (mount(mpt->dst, mpt->dst, NULL, new_flags, 0) == -1) {
PLOG_W("mount('%s', flags:%s)", mpt->dst, mountFlagsToStr(new_flags));
if (mpt->mandatory) {
PLOG_W("mount('%s', flags:%s)", mpt->dst, mountFlagsToStr(new_flags));
return false;
}
PLOG_D("mount('%s', flags:%s)", mpt->dst, mountFlagsToStr(new_flags));
}
return true;