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 99E45138359 for ; Wed, 6 May 2020 17:41:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD864E08FC; Wed, 6 May 2020 17:41:58 +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 C4290E08FC for ; Wed, 6 May 2020 17:41:58 +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 B87E834F3C2 for ; Wed, 6 May 2020 17:41:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26FBA1BD for ; Wed, 6 May 2020 17:41:56 +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: <1588786875.9f60d7d97a9fb72d10b756801a79ad5878a9bfa2.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: 9f60d7d97a9fb72d10b756801a79ad5878a9bfa2 X-VCS-Branch: master Date: Wed, 6 May 2020 17:41:56 +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: 5693d48c-fa04-46de-98d4-b202f6107a61 X-Archives-Hash: 0da4f69a2b8cff1e9ee5c7df137abe87 commit: 9f60d7d97a9fb72d10b756801a79ad5878a9bfa2 Author: Etienne Buira free fr> AuthorDate: Wed May 6 16:46:10 2020 +0000 Commit: Matt Turner gentoo 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 free.fr> 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 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,