On Thu, 14 May 2020 23:37:28 -0700
Matt Turner <[email protected]> wrote:

> This will allow us to factor out the ['source', 'target'] from each
> case.
> 
> Signed-off-by: Matt Turner <[email protected]>
> ---
>  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', {

Looks fine

Reply via email to