[gentoo-commits] proj/catalyst:master commit in: catalyst/, catalyst/base/

["Matt Turner" <mattst88@gentoo.org>]

commit:     2e91db10c272e3943b768573b27477bca02e53d3
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 19 23:55:46 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 00:00:08 2019 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2e91db10

Mount tmpfs at /run

Closes: https://bugs.gentoo.org/659238
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/base/stagebase.py | 3 +++
 catalyst/defaults.py       | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 2ad53381..85e30450 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -232,6 +232,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
 		if os.uname()[0] == "Linux":
 			self.mounts.append("devpts")
 			self.mounts.append("shm")
+			self.mounts.append("run")
 
 		self.set_mounts()
 
@@ -977,6 +978,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
 					_cmd = ['mount', '-t', 'tmpfs',
 						'-o', 'size=' + self.settings['var_tmpfs_portage'] + 'G',
 						src, target]
+				else:
+					_cmd = ['mount', '-t', 'tmpfs', src, target]
 			else:
 				if os.uname()[0] == "FreeBSD":
 					if src == "/dev":

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index f2fe29df..cb5f84e3 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -91,6 +91,7 @@ TARGET_MOUNT_DEFAULTS = {
 	"port_logdir": "/var/log/portage",
 	"proc": "/proc",
 	"shm": "/dev/shm",
+	"run": "/run",
 	}
 
 SOURCE_MOUNT_DEFAULTS = {
@@ -101,6 +102,7 @@ SOURCE_MOUNT_DEFAULTS = {
 	"port_tmpdir": "tmpfs",
 	"proc": "/proc",
 	"shm": "shmfs",
+	"run": "tmpfs",
 	}
 
 # legend:  key: message