From 331f2bcd741e8ecfea816ef598d1d6d97e64f4cd Mon Sep 17 00:00:00 2001
From: Robert Swiecki <robert@swiecki.net>
Date: Thu, 28 Mar 2019 23:25:15 +0100
Subject: [PATCH] mnt: try /run/user/<uid>/nsjail as a root mount dir first

---
 mnt.cc | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/mnt.cc b/mnt.cc
index 81b7eac..8b1c9b2 100644
--- a/mnt.cc
+++ b/mnt.cc
@@ -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.")
-- 
2.34.1