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 ECD9F138239 for ; Sun, 29 Mar 2020 17:48:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13B72E09DF; Sun, 29 Mar 2020 17:48:50 +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 ED337E09DF for ; Sun, 29 Mar 2020 17:48:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 0B7EC34F684 for ; Sun, 29 Mar 2020 17:48:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A4A51A4 for ; Sun, 29 Mar 2020 17:48:47 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1585445714.a4f0612d4162d937652c34200e3de0925d113e05.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a4f0612d4162d937652c34200e3de0925d113e05 X-VCS-Branch: master Date: Sun, 29 Mar 2020 17:48:47 +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: 9c975c73-d6ed-4110-8f14-19b3cce0d15a X-Archives-Hash: 97fcb2b3a87ac837050b7c94971f834b commit: a4f0612d4162d937652c34200e3de0925d113e05 Author: Matt Turner gentoo org> AuthorDate: Sat Mar 28 22:00:59 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Mar 29 01:35:14 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a4f0612d catalyst: Skip "maybe_tmpfs" directory creation Fixes: 8441372c2857 (fix /var/tmp/portage not being forced into a tmpfs) Signed-off-by: Matt Turner 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 939e03e2..4855c9f0 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -963,7 +963,7 @@ class StageBase(TargetBase, ClearBase, GenBase): ensure_dirs(target, mode=0o755) if not os.path.exists(self.mountmap[x]): - if self.mountmap[x] not in ["tmpfs", "shmfs"]: + if self.mountmap[x] not in ("maybe_tmpfs", "tmpfs", "shmfs"): ensure_dirs(self.mountmap[x], mode=0o755) src = self.mountmap[x]