From 47d10ed34c5cbbfdc1cb5331c85f7f2da4a6adf8 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Thu, 5 May 2016 17:40:20 +0300 Subject: [PATCH] TMP: regular-*.iso will pull make-initrd though --- features.in/dev/config.mk | 2 +- features.in/plymouth/config.mk | 4 ++-- features.in/stage2/config.mk | 2 +- pkg.in/lists/tagged/rescue+misc | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/features.in/dev/config.mk b/features.in/dev/config.mk index 6df91a1..7cec282 100644 --- a/features.in/dev/config.mk +++ b/features.in/dev/config.mk @@ -10,7 +10,7 @@ use/dev/repo: use/dev use/repo/main @$(call add,THE_PACKAGES,apt-repo) @$(call add,MAIN_PACKAGES,rpm-build basesystem) @$(call add,MAIN_PACKAGES,fakeroot sisyphus_check) - @$(call add,MAIN_PACKAGES,file make-initrd make-initrd-propagator) + @$(call add,MAIN_PACKAGES,file make-initrd2 make-initrd2-propagator) use/dev/builder/base: use/dev/mkimage use/dev @$(call set,KFLAVOURS,$(BIGRAM)) diff --git a/features.in/plymouth/config.mk b/features.in/plymouth/config.mk index b8b0c68..df48a9e 100644 --- a/features.in/plymouth/config.mk +++ b/features.in/plymouth/config.mk @@ -15,14 +15,14 @@ use/plymouth: # while leaving the very basic text bootloader screen use/plymouth/stage2: use/plymouth use/branding \ use/syslinux/ui/gfxboot use/stage2/kms - @$(call add,STAGE1_PACKAGES_REGEXP,make-initrd-plymouth) + @$(call add,STAGE1_PACKAGES_REGEXP,make-initrd2-plymouth) @$(call add,STAGE1_BRANDING,bootsplash) @$(call add,STAGE2_BRANDING,bootsplash) @$(call add,STAGE2_BOOTARGS,quiet splash) use/plymouth/base: use/plymouth/stage2 @$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth) - @$(call add,BASE_PACKAGES_REGEXP,make-initrd-plymouth cpio) + @$(call add,BASE_PACKAGES_REGEXP,make-initrd2-plymouth cpio) @$(call add,BASE_KMODULES_REGEXP,drm.*) @$(call add,THE_BRANDING,bootsplash) diff --git a/features.in/stage2/config.mk b/features.in/stage2/config.mk index 2eb7099..1515d21 100644 --- a/features.in/stage2/config.mk +++ b/features.in/stage2/config.mk @@ -1,7 +1,7 @@ # "1" is not a typo use/stage2: sub/stage1 @$(call add_feature) - @$(call add,STAGE1_PACKAGES,file make-initrd make-initrd-propagator propagator) + @$(call add,STAGE1_PACKAGES,file make-initrd2 make-initrd2-propagator propagator) @$(call add,STAGE1_MODLISTS,$$(FEATURES)) @$(call xport,STAGE1_KCONFIG) diff --git a/pkg.in/lists/tagged/rescue+misc b/pkg.in/lists/tagged/rescue+misc index daac5a1..ca10b64 100644 --- a/pkg.in/lists/tagged/rescue+misc +++ b/pkg.in/lists/tagged/rescue+misc @@ -48,6 +48,7 @@ sysfsutils # initrd helpers make-initrd-devmapper make-initrd-mdadm + make-initrd-lvm make-initrd-multipath make-initrd-nfs -- 2.7.4