← Back to team overview

curtin-dev team mailing list archive

Re: [Merge] ~dbungert/curtin:fix-curthooks-nonamd64 into curtin:master

 

Review: Approve



Diff comments:

> diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py
> index 4bc3614..82ebcab 100644
> --- a/curtin/commands/curthooks.py
> +++ b/curtin/commands/curthooks.py
> @@ -1853,6 +1853,18 @@ def redhat_update_initramfs(target, cfg):
>          in_chroot.subp(dracut_cmd, capture=True)
>  
>  
> +def uses_grub(machine):
> +    # As a rule, ARMv7 systems don't use grub. This may change some

non-blocking nit thought: do we need the comment that singles out armv7 here? What's the difference in behavior between armv7, aarch64, and other arm arches (e.g. armhf)? and why not just check dpkg arch?

> +    # day, but for now, assume no. They do require the initramfs
> +    # to be updated, and this also triggers boot loader setup via
> +    # flash-kernel.
> +    if (machine.startswith('armv7') or
> +            machine.startswith('s390x') or
> +            machine.startswith('aarch64') and not util.is_uefi_bootable()):
> +        return False
> +    return True
> +
> +
>  def builtin_curthooks(cfg, target, state):
>      LOG.info('Running curtin builtin curthooks')
>      stack_prefix = state.get('report_stack_prefix', '')


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



References