[OE-core] [PATCH] wic: isoimage-isohybrid: add grubefi configfile support

[Ed Bartosh]

Hi Ioan-Adrian,

Thank you for the patch! My comment is below.
Please, make sure your change doesn't break wic tests.

On Wed, Apr 20, 2016 at 12:17:32PM +0300, Ioan-Adrian Ratiu wrote:
> The latest wic kickstart refactoring introduced a bootloader option
> "--configfile" which lets wks' specify a custom grub.cfg for use
> while booting. This is very useful for creating stuff like boot menus.
> 
> This change lets isoimage-isohybrid use --configfile; if this option is
> not specified in a wks, it generates a default cfg as before.
> 
> Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu at ni.com>
> ---
>  .../lib/wic/plugins/source/isoimage-isohybrid.py   | 59 ++++++++++++++--------
>  1 file changed, 37 insertions(+), 22 deletions(-)
> 
> diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
> index bc99283..37d2fc2 100644
> --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
> +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
> @@ -27,6 +27,7 @@ import glob
>  
>  from wic import msger
>  from wic.pluginbase import SourcePlugin
> +from wic.utils.misc import get_custom_config
>  from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var
>  
>  class IsoImagePlugin(SourcePlugin):
> @@ -94,33 +95,47 @@ class IsoImagePlugin(SourcePlugin):
>          """
>          Create loader-specific (grub-efi) config
>          """
> -        splash = os.path.join(cr_workdir, "/EFI/boot/splash.jpg")
> -        if os.path.exists(splash):
> -            splashline = "menu background splash.jpg"
> -        else:
> -            splashline = ""
> +        configfile = creator.ks.bootloader.configfile
> +        custom_cfg = None
> +        if configfile:
> +            custom_cfg = get_custom_config(configfile)
> +            if custom_cfg:
> +                # Use a custom configuration for grub
> +                grubefi_conf = custom_cfg
> +                msger.debug("Using custom configuration file "
> +                        "%s for grub.cfg" % configfile)
> +            else:
> +                msger.error("configfile is specified but failed to "
> +                        "get it from %s." % configfile)
>  
> -        bootloader = creator.ks.bootloader
> +        if not custom_cfg:
Looks like you don't need custom_cfg variable here. This code can be put
into 'else' scope of 'if configfile' statement.
> +            splash = os.path.join(cr_workdir, "/EFI/boot/splash.jpg")
> +            if os.path.exists(splash):
> +                splashline = "menu background splash.jpg"
> +            else:
> +                splashline = ""
>
> -        grubefi_conf = ""
> -        grubefi_conf += "serial --unit=0 --speed=115200 --word=8 "
> -        grubefi_conf += "--parity=no --stop=1\n"
> -        grubefi_conf += "default=boot\n"
> -        grubefi_conf += "timeout=%s\n" % (bootloader.timeout or 10)
> -        grubefi_conf += "\n"
> -        grubefi_conf += "search --set=root --label %s " % part.label
> -        grubefi_conf += "\n"
> -        grubefi_conf += "menuentry 'boot'{\n"
> +            bootloader = creator.ks.bootloader
>  
> -        kernel = "/bzImage"
> +            grubefi_conf = ""
> +            grubefi_conf += "serial --unit=0 --speed=115200 --word=8 "
> +            grubefi_conf += "--parity=no --stop=1\n"
> +            grubefi_conf += "default=boot\n"
> +            grubefi_conf += "timeout=%s\n" % (bootloader.timeout or 10)
> +            grubefi_conf += "\n"
> +            grubefi_conf += "search --set=root --label %s " % part.label
> +            grubefi_conf += "\n"
> +            grubefi_conf += "menuentry 'boot'{\n"
>  
> -        grubefi_conf += "linux %s rootwait %s\n" \
> -            % (kernel, bootloader.append)
> -        grubefi_conf += "initrd /initrd \n"
> -        grubefi_conf += "}\n"
> +            kernel = "/bzImage"
>  
> -        if splashline:
> -            grubefi_conf += "%s\n" % splashline
> +            grubefi_conf += "linux %s rootwait %s\n" \
> +                            % (kernel, bootloader.append)
> +            grubefi_conf += "initrd /initrd \n"
> +            grubefi_conf += "}\n"
> +
> +            if splashline:
> +                grubefi_conf += "%s\n" % splashline
>  
>          msger.debug("Writing grubefi config %s/EFI/BOOT/grub.cfg" \
>                          % cr_workdir)

--
Regards,
Ed