mixin.mk, regular.mk: fix portability

mixin/regular-desktop can be used in non-x86 builds where dualboot situation tends to be more rare; let's keep this installer feature (tweaking installer to pick up "other" filesystems) to regular.mk.

mixin.mk, regular.mk: fix portability
c6b80f34 · Anton Midyukov · Michael Shigorin · ac489474 · c6b80f34 · c6b80f34
Commit c6b80f34 authored Dec 24, 2018 by Anton Midyukov Committed by Michael Shigorin Jan 14, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mixin.mk conf.d/mixin.mk +0 -1

regular.mk conf.d/regular.mk +1 -0

No files found.
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -50,7 +50,6 @@ mixin/regular-x11: use/luks use/volumes/regular \
 # common WM live/installer bits
 mixin/regular-desktop: use/x11/xorg +alsa use/xdg-user-dirs
 	@$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit)
-	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
 	@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
 	@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
 	@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))

--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -31,6 +31,7 @@ distro/.regular-desktop: distro/.regular-wm \
 	@$(call add,THE_BRANDING,bootloader)
 	@$(call add,THE_PACKAGES,upower bluez)
 	@$(call add,THE_PACKAGES,vconsole-setup-kludge)	#28805
+	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
 	@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 	@$(call set,KFLAVOURS,std-def)