diff options
| author | Adrian Gibanel Lopez <adrian.gibanel@btactic.com> | 2016-01-18 03:07:48 +0000 |
|---|---|---|
| committer | Adrian Gibanel Lopez <adrian.gibanel@btactic.com> | 2016-07-31 15:08:11 +0200 |
| commit | 9d1a983cc8fe12966d1a2c24a6ee0cfb419b3ce5 (patch) | |
| tree | 1c11f9966417b1d915baf8b264fb497dd82d4666 /functions/defaults.sh | |
| parent | 0624064d44ed811aec5c43fabfd7b928688ed8e1 (diff) | |
| download | vyos-live-build-9d1a983cc8fe12966d1a2c24a6ee0cfb419b3ce5.tar.gz vyos-live-build-9d1a983cc8fe12966d1a2c24a6ee0cfb419b3ce5.zip | |
Added new multi bootloader helper functions
* Added: functions/bootloaders.sh . This file adds bootloader functions that are heavily used in efi scenarios where a bootloader can act as a first or an extra bootloader.
Since the introduction of the new switch:
--bootloaders
you can setup it like this:
--bootloaders=syslinux,grub-efi
.
This means that syslinux is the first bootloader and grub-efi is the extra bootloader.
* Added new bootloader functions: Check_Non_First_Bootloader and Check_Non_Extra_Bootloader.
These functions let each one of the bootloaders abort the build because
they cannot perform a role either as a first bootloader or as an extra bootloader.
* Added bootloader functions: Check_First_Bootloader_Role, Check_Extra_Bootloader_Role and Check_Any_Bootloader_Role
These functions let bootloaders to force their default role in a single line.
At the same time many binary bootloaders were rewritten to make use of the new bootloader role functions explained above.
These roles were enforced:
binary_grub-legacy : First bootloader
binary_grub-pc : Either first or extra bootloader
binary_syslinux : Either first or extra bootloader
If a bootloader is tried to be used in a role that it's not meant to be used then the build fails because that might lead to a non-bootable system.
Diffstat (limited to 'functions/defaults.sh')
| -rwxr-xr-x | functions/defaults.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 334984f7b..deeaf2dc6 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -537,7 +537,7 @@ Set_defaults () esac fi - LB_PRIMARY_BOOTLOADER=$(echo "${LB_BOOTLOADERS}" | awk -F, '{ print $1 }') + LB_FIRST_BOOTLOADER=$(echo "${LB_BOOTLOADERS}" | awk -F, '{ print $1 }') # Setting checksums case "${LB_MODE}" in @@ -847,7 +847,7 @@ Check_defaults () fi fi - if [ "${LB_PRIMARY_BOOTLOADER}" = "syslinux" ] + if [ "${LB_FIRST_BOOTLOADER}" = "syslinux" ] then # syslinux + fat or ntfs, or extlinux + ext[234] or btrfs case "${LB_BINARY_FILESYSTEM}" in @@ -861,7 +861,7 @@ Check_defaults () case "${LIVE_IMAGE_TYPE}" in hdd*) - case "${LB_PRIMARY_BOOTLOADER}" in + case "${LB_FIRST_BOOTLOADER}" in grub) Echo_error "You have selected a combination of bootloader and image type that is currently not supported by live-build. Please use either another bootloader or a different image type." exit 1 |