From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9FF5A138350 for ; Mon, 27 Jan 2020 18:53:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB137E0829; Mon, 27 Jan 2020 18:53:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BCCFEE0829 for ; Mon, 27 Jan 2020 18:53:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A258534E497 for ; Mon, 27 Jan 2020 18:52:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 089FD8F for ; Mon, 27 Jan 2020 18:52:58 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1580151175.8441372c285726de85c71a83035a9e11cc47f037.zerochaos@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/defaults.py X-VCS-Directories: catalyst/ catalyst/base/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 8441372c285726de85c71a83035a9e11cc47f037 X-VCS-Branch: master Date: Mon, 27 Jan 2020 18:52:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 76debaf5-0bd7-4735-9fc0-3b900c27cce9 X-Archives-Hash: 501b294721520bc808519ef7111b4daa commit: 8441372c285726de85c71a83035a9e11cc47f037 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Mon Jan 27 18:50:42 2020 +0000 Commit: Rick Farina gentoo org> CommitDate: Mon Jan 27 18:52:55 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8441372c fix /var/tmp/portage not being forced into a tmpfs 2e91db10 accidently revealed that src tmpfs was being being used when we meant "this might be a tmpfs, or it might not". Fix preexisting code to be more readable and adjust src tmpfs to be what a sane person would expect Signed-off-by: Rick Farina (Zero_Chaos) gentoo.org> catalyst/base/stagebase.py | 6 +++--- catalyst/defaults.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 85e30450..d29b48fc 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -973,13 +973,13 @@ class StageBase(TargetBase, ClearBase, GenBase): if "snapcache" in self.settings["options"] and x == "portdir": self.snapcache_lock.read_lock() _cmd = None - if src == "tmpfs": + if src == "maybe_tmpfs": if "var_tmpfs_portage" in self.settings: _cmd = ['mount', '-t', 'tmpfs', '-o', 'size=' + self.settings['var_tmpfs_portage'] + 'G', src, target] - else: - _cmd = ['mount', '-t', 'tmpfs', src, target] + elif src == "tmpfs": + _cmd = ['mount', '-t', 'tmpfs', src, target] else: if os.uname()[0] == "FreeBSD": if src == "/dev": diff --git a/catalyst/defaults.py b/catalyst/defaults.py index cb5f84e3..705ae931 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -99,7 +99,7 @@ SOURCE_MOUNT_DEFAULTS = { "devpts": "/dev/pts", "distdir": DISTDIR[:], "portdir": PORTDIR[:], - "port_tmpdir": "tmpfs", + "port_tmpdir": "maybe_tmpfs", "proc": "/proc", "shm": "shmfs", "run": "tmpfs",