From a490e39d357e23d596e1a502abaa86d191f78a2e Mon Sep 17 00:00:00 2001
From: Michael Shigorin <mike@altlinux.org>
Date: Fri, 10 Aug 2018 13:58:29 +0300
Subject: [PATCH] bootloader, mixin.mk: use/bootloader/os-prober

This really belongs to bootloader feature rather than
to mixin/desktop-installer alone; moving out.
---
 conf.d/mixin.mk                  | 5 +----
 features.in/bootloader/config.mk | 5 +++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/conf.d/mixin.mk b/conf.d/mixin.mk
index c461edb1..8bef14b9 100644
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -2,13 +2,10 @@
 
 ### desktop.mk
 mixin/desktop-installer: +net-eth +vmguest \
-	use/x11-autostart use/fonts/install2 use/sound
+	use/bootloader/os-prober use/x11-autostart use/fonts/install2 use/sound
 	@$(call add,BASE_LISTS, \
 		$(call tags,(base || desktop) && (l10n || network)))
 	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
-ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
-	@$(call add,BASE_PACKAGES,os-prober)
-endif
 
 ### e2k.mk
 mixin/e2k-base: use/tty/S0 use/net-eth/dhcp; @:
diff --git a/features.in/bootloader/config.mk b/features.in/bootloader/config.mk
index c8eb3f90..096af410 100644
--- a/features.in/bootloader/config.mk
+++ b/features.in/bootloader/config.mk
@@ -17,3 +17,8 @@ use/bootloader/grub use/bootloader/lilo: use/bootloader/%: use/bootloader
 
 use/bootloader/live: use/bootloader
 	@$(call add,LIVE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
+
+use/bootloader/os-prober: use/bootloader
+ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
+	@$(call add,BASE_PACKAGES,os-prober)
+endif