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