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 771551382C5 for ; Fri, 15 May 2020 06:37:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79B55E08C2; Fri, 15 May 2020 06:37:42 +0000 (UTC) Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) (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 6DF97E08C2 for ; Fri, 15 May 2020 06:37:42 +0000 (UTC) Received: by mail-pj1-f67.google.com with SMTP id mq3so523855pjb.1 for ; Thu, 14 May 2020 23:37:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GY8wBe6THv3B+52iw8X2LjRm3H8a4EFx6cLj802NPTs=; b=Hf+1lDacJ3O2VAc4mymNlhzzENxkrE76nbh0uj+bL2SK++X0OlLabxdRIeIvYfkl92 u7p6a7MIUTpf41ZqAQm0uwO4nldactvG14pklcYLN+IwCls5yTO/qI3WN6W18ZkeKWMf JkWYXgr+Vvb+cxZXNSDZ+nt42lvPa49xhm3TsNSmIiF+ZFW0RLlXVAqmzMfO7eky/VNy TibMowb8gWSxXAVLREpXO0vLasRE6oIDpKA71lm9s11L31LIgBphSKfaSkGuiV285ZSo jcdTN+GYpj/vlBzmWJcaPhz5cR6Q90UVvx2tYlKALn+/OQDjQL4Clc0fWGpRBXJPYWwL 5ygw== X-Gm-Message-State: AOAM532wIZxMAKdrSSfUUAr4XVX73u2V58t/SAiWHyCcMRiwfluBabyL wPqj8Vrzh7i13418U3D1kUxAr7Xc X-Google-Smtp-Source: ABdhPJytkGwG685ezLlE4MYI+f+4fh0x7uDCBwsK23Lgt9GYityzEN/gf1N5+D+JAdlEmlhevPLlVg== X-Received: by 2002:a17:902:2:: with SMTP id 2mr2146433pla.311.1589524660835; Thu, 14 May 2020 23:37:40 -0700 (PDT) Received: from localhost ([134.134.139.83]) by smtp.gmail.com with ESMTPSA id 135sm989973pfu.125.2020.05.14.23.37.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2020 23:37:39 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 1/3] catalyst: Rename shmfs -> shm Date: Thu, 14 May 2020 23:37:28 -0700 Message-Id: <20200515063730.2582596-1-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 93669910-dd49-4ab8-a2ba-b0fe54b0255b X-Archives-Hash: a176cae296595964137ce8b9a5cb54f1 This will allow us to factor out the ['source', 'target'] from each case. Signed-off-by: Matt Turner --- 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', { -- 2.26.2