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

["Rick Farina" <zerochaos@gentoo.org>]

commit:     8441372c285726de85c71a83035a9e11cc47f037
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 18:50:42 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 18:52:55 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8441372c

fix /var/tmp/portage not being forced into a tmpfs

2e91db10 accidently revealed that src tmpfs was being being used when we
meant "this might be a tmpfs, or it might not".  Fix preexisting code to
be more readable and adjust src tmpfs to be what a sane person would
expect

Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>

 catalyst/base/stagebase.py | 6 +++---
 catalyst/defaults.py       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 85e30450..d29b48fc 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -973,13 +973,13 @@ class StageBase(TargetBase, ClearBase, GenBase):
 			if "snapcache" in self.settings["options"] and x == "portdir":
 				self.snapcache_lock.read_lock()
 			_cmd = None
-			if src == "tmpfs":
+			if src == "maybe_tmpfs":
 				if "var_tmpfs_portage" in self.settings:
 					_cmd = ['mount', '-t', 'tmpfs',
 						'-o', 'size=' + self.settings['var_tmpfs_portage'] + 'G',
 						src, target]
-				else:
-					_cmd = ['mount', '-t', 'tmpfs', src, target]
+			elif src == "tmpfs":
+				_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 cb5f84e3..705ae931 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -99,7 +99,7 @@ SOURCE_MOUNT_DEFAULTS = {
 	"devpts": "/dev/pts",
 	"distdir": DISTDIR[:],
 	"portdir": PORTDIR[:],
-	"port_tmpdir": "tmpfs",
+	"port_tmpdir": "maybe_tmpfs",
 	"proc": "/proc",
 	"shm": "shmfs",
 	"run": "tmpfs",