| 1 |
commit: 8441372c285726de85c71a83035a9e11cc47f037 |
| 2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 27 18:50:42 2020 +0000 |
| 4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 27 18:52:55 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8441372c |
| 7 |
|
| 8 |
fix /var/tmp/portage not being forced into a tmpfs |
| 9 |
|
| 10 |
2e91db10 accidently revealed that src tmpfs was being being used when we |
| 11 |
meant "this might be a tmpfs, or it might not". Fix preexisting code to |
| 12 |
be more readable and adjust src tmpfs to be what a sane person would |
| 13 |
expect |
| 14 |
|
| 15 |
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org> |
| 16 |
|
| 17 |
catalyst/base/stagebase.py | 6 +++--- |
| 18 |
catalyst/defaults.py | 2 +- |
| 19 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 22 |
index 85e30450..d29b48fc 100644 |
| 23 |
--- a/catalyst/base/stagebase.py |
| 24 |
+++ b/catalyst/base/stagebase.py |
| 25 |
@@ -973,13 +973,13 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 26 |
if "snapcache" in self.settings["options"] and x == "portdir": |
| 27 |
self.snapcache_lock.read_lock() |
| 28 |
_cmd = None |
| 29 |
- if src == "tmpfs": |
| 30 |
+ if src == "maybe_tmpfs": |
| 31 |
if "var_tmpfs_portage" in self.settings: |
| 32 |
_cmd = ['mount', '-t', 'tmpfs', |
| 33 |
'-o', 'size=' + self.settings['var_tmpfs_portage'] + 'G', |
| 34 |
src, target] |
| 35 |
- else: |
| 36 |
- _cmd = ['mount', '-t', 'tmpfs', src, target] |
| 37 |
+ elif src == "tmpfs": |
| 38 |
+ _cmd = ['mount', '-t', 'tmpfs', src, target] |
| 39 |
else: |
| 40 |
if os.uname()[0] == "FreeBSD": |
| 41 |
if src == "/dev": |
| 42 |
|
| 43 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
| 44 |
index cb5f84e3..705ae931 100644 |
| 45 |
--- a/catalyst/defaults.py |
| 46 |
+++ b/catalyst/defaults.py |
| 47 |
@@ -99,7 +99,7 @@ SOURCE_MOUNT_DEFAULTS = { |
| 48 |
"devpts": "/dev/pts", |
| 49 |
"distdir": DISTDIR[:], |
| 50 |
"portdir": PORTDIR[:], |
| 51 |
- "port_tmpdir": "tmpfs", |
| 52 |
+ "port_tmpdir": "maybe_tmpfs", |
| 53 |
"proc": "/proc", |
| 54 |
"shm": "shmfs", |
| 55 |
"run": "tmpfs", |
Archives