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