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

Allow mount options to contain colons.

Browse Source 
This is particularly important for overlayfs, which allows multiple
layers to be given to `lowerdir` separated by colons: see
<https://www.kernel.org/doc/Documentation/filesystems/overlayfs.txt>,
section ‘Multiple lower layers’.
This commit is contained in:
James Kay 2021-09-15 16:50:45 +01:00 committed by happyCoder92
parent 246d4721b1
commit e09610e789
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmdline.cc
View File

@ -43,6 +43,7 @@
#include <unistd.h>
#include <memory>
#include <sstream>
#include <string>
#include <vector>
@ -777,7 +778,12 @@ std::unique_ptr<nsjconf_t> parseArgs(int argc, char* argv[]) {
dst = src;
}
std::string fs_type = argFromVec(subopts, 2);
std::string options = argFromVec(subopts, 3);
std::stringstream optionsStream;
optionsStream << argFromVec(subopts, 3);
for (std::size_t i = 4; i < subopts.size(); ++i) {
optionsStream << ":" << subopts[i];
}
std::string options = optionsStream.str();
if (!mnt::addMountPtTail(nsjconf.get(), src, dst, /* fstype= */ fs_type,
/* options= */ options, /* flags= */ 0,
/* is_dir= */ mnt::NS_DIR_MAYBE, /* is_mandatory= */ true,