diff options
author | Mariano Lopez <mariano.lopez@linux.intel.com> | 2015-11-18 07:39:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-09 08:48:24 +0000 |
commit | 9773faadfeee0e64fc405e0192f32aa8eca95a76 (patch) | |
tree | c927a137b056131f11d1295f8b8573632d78e421 /scripts/lib/wic/kickstart/__init__.py | |
parent | 4515186bc4427a67ee34b43c733ad593ea6837d9 (diff) | |
download | poky-9773faadfeee0e64fc405e0192f32aa8eca95a76.tar.gz |
wic: Prepare wicboot to allow custom bootloader config
Currently wic does the bootloader configuration file on the fly.
This change introduce a configfile variable for the bootloader;
this is to have a user defined configuration file for the
bootloaders (grub, syslinux, and gummiboot). This is particular
useful when having a multiboot system or scripts embedded in the
configuration file.
[YOCTO #8728]
(From OE-Core rev: 8347aee95ea271921c15ea8e580f0ff62325aa26)
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/kickstart/__init__.py')
-rw-r--r-- | scripts/lib/wic/kickstart/__init__.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/lib/wic/kickstart/__init__.py b/scripts/lib/wic/kickstart/__init__.py index c9b0e51f3c..79b39fbf3f 100644 --- a/scripts/lib/wic/kickstart/__init__.py +++ b/scripts/lib/wic/kickstart/__init__.py | |||
@@ -97,6 +97,13 @@ def get_timeout(kickstart, default=None): | |||
97 | return default | 97 | return default |
98 | return int(kickstart.handler.bootloader.timeout) | 98 | return int(kickstart.handler.bootloader.timeout) |
99 | 99 | ||
100 | def get_bootloader_file(kickstart, default=None): | ||
101 | if not hasattr(kickstart.handler.bootloader, "configfile"): | ||
102 | return default | ||
103 | if kickstart.handler.bootloader.configfile is None: | ||
104 | return default | ||
105 | return kickstart.handler.bootloader.configfile | ||
106 | |||
100 | def get_kernel_args(kickstart, default="ro rd.live.image"): | 107 | def get_kernel_args(kickstart, default="ro rd.live.image"): |
101 | if not hasattr(kickstart.handler.bootloader, "appendLine"): | 108 | if not hasattr(kickstart.handler.bootloader, "appendLine"): |
102 | return default | 109 | return default |