mnt: try /run/user/<uid>/nsjail as a root mount dir first

This commit is contained in:
Robert Swiecki
2019-03-28 23:25:15 +01:00
parent 9fe225dbe2
commit 331f2bcd74

12
mnt.cc
View File

@@ -282,14 +282,12 @@ static bool mkdirAndTest(const std::string& dir) {
static std::unique_ptr<std::string> getDir(nsjconf_t* nsjconf, const char* name) {
std::unique_ptr<std::string> dir(new std::string);
dir->assign("/run/user/")
.append(std::to_string(nsjconf->orig_uid))
.append("/nsjail.")
.append(std::to_string(nsjconf->orig_uid))
.append(".")
.append(name);
dir->assign("/run/user/").append(std::to_string(nsjconf->orig_uid)).append("/nsjail");
if (mkdirAndTest(*dir)) {
return dir;
dir->append("/").append(name);
if (mkdirAndTest(*dir)) {
return dir;
}
}
dir->assign("/run/user/")
.append("/nsjail.")