commit: 73219eb1c1878d2dd160ba067c6096ff5aefff95 Author: Yuta SATOH <nigoro.dev <AT> gmail <DOT> com> AuthorDate: Fri Dec 29 01:55:05 2017 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Fri Dec 29 02:05:15 2017 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=73219eb1
stagebase.py: Update bind() for Gentoo/FreeBSD tmpfs/shmfs # 363577 Bug url: https://bugs.gentoo.org/363577 catalyst/base/stagebase.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 32cc3df1..eaed73fc 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -967,21 +967,22 @@ class StageBase(TargetBase, ClearBase, GenBase): if "snapcache" in self.settings["options"] and x == "portdir": self.snapcache_lock.read_lock() _cmd = None - if os.uname()[0] == "FreeBSD": - if src == "/dev": - _cmd = ['mount', '-t', 'devfs', 'none', target] - else: - _cmd = ['mount_nullfs', src, target] + if src == "tmpfs": + if "var_tmpfs_portage" in self.settings: + _cmd = ['mount', '-t', 'tmpfs', + '-o', 'size=' + self.settings['var_tmpfs_portage'] + 'G', + src, target] else: - if src == "tmpfs": - if "var_tmpfs_portage" in self.settings: - _cmd = ['mount', '-t', 'tmpfs', - '-o', 'size=' + self.settings['var_tmpfs_portage'] + 'G', - src, target] - elif src == "shmfs": - _cmd = ['mount', '-t', 'tmpfs', '-o', 'noexec,nosuid,nodev', 'shm', target] + if os.uname()[0] == "FreeBSD": + if src == "/dev": + _cmd = ['mount', '-t', 'devfs', 'none', target] + else: + _cmd = ['mount_nullfs', src, target] else: - _cmd = ['mount', '--bind', src, target] + if src == "shmfs": + _cmd = ['mount', '-t', 'tmpfs', '-o', 'noexec,nosuid,nodev', 'shm', target] + else: + _cmd = ['mount', '--bind', src, target] if _cmd: log.debug('bind(); _cmd = %s', _cmd) cmd(_cmd, env=self.env, fail_func=self.unbind)
