← Back to team overview

curtin-dev team mailing list archive

Re: [Merge] ~ogayot/curtin:fix-curthooks-no-kernel into curtin:master

 

Review: Approve

Please mention the LP in the commit message then LGTM.  Thanks!

Diff comments:

> diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py
> index c52d5ab..b0844d5 100644
> --- a/curtin/commands/curthooks.py
> +++ b/curtin/commands/curthooks.py
> @@ -365,12 +365,13 @@ def install_kernel(cfg, target):
>      kernel_cfg = cfg.get('kernel', {'package': None,
>                                      'fallback-package': "linux-generic",
>                                      'mapping': {}})
> -    if kernel_cfg is not None:
> -        kernel_package = kernel_cfg.get('package')
> -        kernel_fallback = kernel_cfg.get('fallback-package')
> -    else:
> -        kernel_package = None
> -        kernel_fallback = None
> +
> +    if kernel_cfg is None:
> +        LOG.debug("Not installing any kernel since kernel: null was specified")
> +        return
> +
> +    kernel_package = kernel_cfg.get('package')

Not at all a requirement for this MP, but attrs objects are fair game now.

> +    kernel_fallback = kernel_cfg.get('fallback-package')
>  
>      mapping = copy.deepcopy(KERNEL_MAPPING)
>      config.merge_config(mapping, kernel_cfg.get('mapping', {}))


-- 
https://code.launchpad.net/~ogayot/curtin/+git/curtin/+merge/446197
Your team curtin developers is subscribed to branch curtin:master.



References