diff options
Diffstat (limited to 'dev-util/catalyst/files/catalyst-9999-tmpfs.patch')
| -rw-r--r-- | dev-util/catalyst/files/catalyst-9999-tmpfs.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/dev-util/catalyst/files/catalyst-9999-tmpfs.patch b/dev-util/catalyst/files/catalyst-9999-tmpfs.patch deleted file mode 100644 index 9a41f49..0000000 --- a/dev-util/catalyst/files/catalyst-9999-tmpfs.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py -index 68ccb79..966d872 100644 ---- a/catalyst/base/stagebase.py -+++ b/catalyst/base/stagebase.py -@@ -935,21 +935,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) |