commit:     9f60d7d97a9fb72d10b756801a79ad5878a9bfa2
Author:     Etienne Buira <etienne.buira <AT> free <DOT> fr>
AuthorDate: Wed May  6 16:46:10 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed May  6 17:41:15 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9f60d7d9

catalyst: Skip only var_tmpfs_portage mount

If var_tmpfs_portage is not in settings, we want to skip the tmpfs mount
only. Prior to this commit subsequent mounts would have been incorrectly
skipped.

Fixes: 4c4a82badb5e (catalyst: Clean up bind())
Signed-off-by: Etienne Buira <etienne.buira <AT> free.fr>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/base/stagebase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 951500d8..964a5129 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -857,7 +857,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
 
             if source == 'maybe_tmpfs':
                 if 'var_tmpfs_portage' not in self.settings:
-                    return
+                    continue
 
                 _cmd = ['mount', '-t', 'tmpfs', '-o', 'size=' +
                         self.settings['var_tmpfs_portage'] + 'G', source,

Reply via email to