diff --git a/features.in/initrd-propagator/README b/features.in/initrd-propagator/README new file mode 100644 index 00000000..6f2ad4c6 --- /dev/null +++ b/features.in/initrd-propagator/README @@ -0,0 +1,3 @@ +Добавляется поддержка propagator. propagator обеспечивает первую стадию загрузчика. +Ранее был неотъемлемой частью субпрофиля stage1. Был вынесен в фичу для обеспечения +возожности собирать образы с использованием специально собранного initrd вместо него. diff --git a/features.in/initrd-propagator/config.mk b/features.in/initrd-propagator/config.mk new file mode 100644 index 00000000..a9e62e0f --- /dev/null +++ b/features.in/initrd-propagator/config.mk @@ -0,0 +1,4 @@ +use/initrd-propagator: + @$(call add_feature) + @$(call add,STAGE1_PACKAGES,make-initrd-propagator propagator) + @$(call set,STAGE1_INITRD,PROPAGATOR) diff --git a/features.in/stage2/stage1/scripts.d/01-initfs b/features.in/initrd-propagator/stage1/scripts.d/01-initfs similarity index 100% rename from features.in/stage2/stage1/scripts.d/01-initfs rename to features.in/initrd-propagator/stage1/scripts.d/01-initfs diff --git a/features.in/stage2/stage1/scripts.d/11-initrd-propagator b/features.in/initrd-propagator/stage1/scripts.d/11-initrd-propagator similarity index 100% rename from features.in/stage2/stage1/scripts.d/11-initrd-propagator rename to features.in/initrd-propagator/stage1/scripts.d/11-initrd-propagator diff --git a/features.in/stage2/stage1/scripts.d/81-make-initfs b/features.in/initrd-propagator/stage1/scripts.d/81-make-initfs similarity index 100% rename from features.in/stage2/stage1/scripts.d/81-make-initfs rename to features.in/initrd-propagator/stage1/scripts.d/81-make-initfs diff --git a/features.in/stage2/stage1/scripts.d/90-build-propagator b/features.in/initrd-propagator/stage1/scripts.d/90-build-propagator similarity index 100% rename from features.in/stage2/stage1/scripts.d/90-build-propagator rename to features.in/initrd-propagator/stage1/scripts.d/90-build-propagator diff --git a/features.in/stage2/config.mk b/features.in/stage2/config.mk index e5ea6656..91f7daf9 100644 --- a/features.in/stage2/config.mk +++ b/features.in/stage2/config.mk @@ -1,8 +1,7 @@ # "1" is not a typo -use/stage2: sub/stage1 use/uuid-iso +use/stage2: sub/stage1 use/initrd-propagator use/uuid-iso @$(call add_feature) @$(call add,STAGE1_PACKAGES,make-initrd file iproute2) - @$(call add,STAGE1_PACKAGES,make-initrd-propagator propagator) @$(call add,STAGE1_MODLISTS,$$(FEATURES)) @$(call xport,STAGE1_PACKAGES) @$(call xport,STAGE1_KCONFIG)