Commit e3571f27 authored by Michael Shigorin's avatar Michael Shigorin

stage2, efi: added kernel config test collector

The newly-introduced STAGE1_KCONFIG variable serves to keep those kernel configuration options that are required to be present in the kernel to boot.
parent 0e98c933
......@@ -13,6 +13,7 @@ use/efi:
@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL))
@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
@$(call try,EFI_BOOTLOADER,elilo) # default one
@$(call add,STAGE1_KCONFIG,EFI EFI_PARTITION EFI_VARS FB_EFI)
use/efi/refind: use/efi
@$(call set,EFI_BOOTLOADER,refind)
......
......@@ -3,3 +3,7 @@
Передача информации о конфигурации ядра между stage1 и stage2 также
требуется для оптимального сжатия squashfs-образа второй стадии.
Возможно пополнение списка опций конфигурации ядра (CONFIG_*),
необходимых для загрузки целевого дистрибутива, посредством
переменной STAGE1_KCONFIG (см. фичу efi в качестве примера).
......@@ -2,6 +2,7 @@
use/stage2: sub/stage1
@$(call add_feature)
@$(call add,STAGE1_PACKAGES,file make-initrd make-initrd-propagator propagator)
@$(call xport,STAGE1_KCONFIG)
use/stage2/kms:
@$(call add,STAGE1_KMODULES_REGEXP,drm.*)
......
......@@ -24,7 +24,7 @@ configured()
ls $CONFIGS >&/dev/null || fatal "no stage1 kernel config found in /boot"
# test for installer-required filesystems support
for opt in SQUASHFS AUFS_FS; do
for opt in SQUASHFS AUFS_FS $GLOBAL_STAGE1_KCONFIG; do
configured "$opt=[my]" || fatal "stage1 kernel must have $opt support"
done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment