From 58e83cea49e62f036324f24d59c73c684f1b1bad Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Sun, 31 Jan 2021 16:21:31 +0700 Subject: [PATCH] build-vm, kernel: Not add specified initrd features into initrd.mk This features not needed for auto-detect. We also add features not only to initrd.mk, but also specify them explicitly in the command. --- features.in/build-vm/image-scripts.d/17-kernel | 1 + features.in/kernel/config.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/features.in/build-vm/image-scripts.d/17-kernel b/features.in/build-vm/image-scripts.d/17-kernel index 83126c1e..fe51f19e 100755 --- a/features.in/build-vm/image-scripts.d/17-kernel +++ b/features.in/build-vm/image-scripts.d/17-kernel @@ -27,6 +27,7 @@ fi for KVER in $kver; do make-initrd -N -k "$KVER" AUTODETECT= \ + FEATURES+="add-modules compress cleanup $INITRDFEATURE" \ MODULES_TRY_ADD+="$GLOBAL_VM_INITRDMODULES" \ || { echo "** Error: make-initrd failed" >&2; exit 1; } done diff --git a/features.in/kernel/config.mk b/features.in/kernel/config.mk index b828e2fa..8a3b2e58 100644 --- a/features.in/kernel/config.mk +++ b/features.in/kernel/config.mk @@ -46,7 +46,6 @@ use/kernel/server: # for vm targets use/kernel/initrd-setup: use/kernel - @$(call add,VM_INITRDFEATURES,add-modules compress cleanup) @$(call try,VM_FSTYPE,ext4) @$(call add,VM_INITRDMODULES,$$(VM_FSTYPE)) @$(call add,VM_INITRDMODULES,ahci sd_mod)