Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 1/3] catalyst: Rename shmfs -> shm
Date: Fri, 15 May 2020 06:37:44
Message-Id: 20200515063730.2582596-1-mattst88@gentoo.org
1 This will allow us to factor out the ['source', 'target'] from each
2 case.
3
4 Signed-off-by: Matt Turner <mattst88@g.o>
5 ---
6 catalyst/base/stagebase.py | 4 ++--
7 catalyst/defaults.py | 2 +-
8 2 files changed, 3 insertions(+), 3 deletions(-)
9
10 diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
11 index 68945da8..52f9cd5b 100644
12 --- a/catalyst/base/stagebase.py
13 +++ b/catalyst/base/stagebase.py
14 @@ -864,9 +864,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
15 target]
16 elif source == 'tmpfs':
17 _cmd = ['mount', '-t', 'tmpfs', source, target]
18 - elif source == 'shmfs':
19 + elif source == 'shm':
20 _cmd = ['mount', '-t', 'tmpfs', '-o', 'noexec,nosuid,nodev',
21 - 'shm', target]
22 + source, target]
23 else:
24 _cmd = ['mount', source, target]
25
26 diff --git a/catalyst/defaults.py b/catalyst/defaults.py
27 index 9d5771d5..404f4892 100644
28 --- a/catalyst/defaults.py
29 +++ b/catalyst/defaults.py
30 @@ -99,7 +99,7 @@ MOUNT_DEFAULTS = OrderedDict([
31 }),
32 ('shm', {
33 'enable': True,
34 - 'source': 'shmfs',
35 + 'source': 'shm',
36 'target': '/dev/shm',
37 }),
38 ('run', {
39 --
40 2.26.2

Replies