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 48D431382C5 for ; Fri, 15 May 2020 06:32:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C36DBE0844; Fri, 15 May 2020 06:32:05 +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 9480FE0844 for ; Fri, 15 May 2020 06:32:04 +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 0863F350F54 for ; Fri, 15 May 2020 06:32:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46318103 for ; Fri, 15 May 2020 06:32:00 +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: <1589524294.111f8243f3261d8cb0871b6f4b2087d7ce5e9b69.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: catalyst/base/, catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/defaults.py X-VCS-Directories: catalyst/base/ catalyst/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 111f8243f3261d8cb0871b6f4b2087d7ce5e9b69 X-VCS-Branch: pending/mattst88 Date: Fri, 15 May 2020 06:32:00 +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: eb5429fe-d7a3-4fda-9dd6-543b2efcd60d X-Archives-Hash: dc6c75b133d157b8ea36b8e996982f85 Message-ID: <20200515063200.lU_iBHKS49zI-7SssKAEZyC2gNJPBQDPMe1YWb47FTI@z> commit: 111f8243f3261d8cb0871b6f4b2087d7ce5e9b69 Author: Matt Turner gentoo org> AuthorDate: Fri May 15 06:16:28 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri May 15 06:31:34 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=111f8243 catalyst: Rename shmfs -> shm This will allow us to factor out the ['source', 'target'] from each case. Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 4 ++-- catalyst/defaults.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 68945da8..52f9cd5b 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -864,9 +864,9 @@ class StageBase(TargetBase, ClearBase, GenBase): target] elif source == 'tmpfs': _cmd = ['mount', '-t', 'tmpfs', source, target] - elif source == 'shmfs': + elif source == 'shm': _cmd = ['mount', '-t', 'tmpfs', '-o', 'noexec,nosuid,nodev', - 'shm', target] + source, target] else: _cmd = ['mount', source, target] diff --git a/catalyst/defaults.py b/catalyst/defaults.py index 9d5771d5..404f4892 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -99,7 +99,7 @@ MOUNT_DEFAULTS = OrderedDict([ }), ('shm', { 'enable': True, - 'source': 'shmfs', + 'source': 'shm', 'target': '/dev/shm', }), ('run', {