| 1 |
commit: 9f60d7d97a9fb72d10b756801a79ad5878a9bfa2 |
| 2 |
Author: Etienne Buira <etienne.buira <AT> free <DOT> fr> |
| 3 |
AuthorDate: Wed May 6 16:46:10 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 6 17:41:15 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9f60d7d9 |
| 7 |
|
| 8 |
catalyst: Skip only var_tmpfs_portage mount |
| 9 |
|
| 10 |
If var_tmpfs_portage is not in settings, we want to skip the tmpfs mount |
| 11 |
only. Prior to this commit subsequent mounts would have been incorrectly |
| 12 |
skipped. |
| 13 |
|
| 14 |
Fixes: 4c4a82badb5e (catalyst: Clean up bind()) |
| 15 |
Signed-off-by: Etienne Buira <etienne.buira <AT> free.fr> |
| 16 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 17 |
|
| 18 |
catalyst/base/stagebase.py | 2 +- |
| 19 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 22 |
index 951500d8..964a5129 100644 |
| 23 |
--- a/catalyst/base/stagebase.py |
| 24 |
+++ b/catalyst/base/stagebase.py |
| 25 |
@@ -857,7 +857,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 26 |
|
| 27 |
if source == 'maybe_tmpfs': |
| 28 |
if 'var_tmpfs_portage' not in self.settings: |
| 29 |
- return |
| 30 |
+ continue |
| 31 |
|
| 32 |
_cmd = ['mount', '-t', 'tmpfs', '-o', 'size=' + |
| 33 |
self.settings['var_tmpfs_portage'] + 'G', source, |
Archives