diff --git a/conf.d/desktop.mk b/conf.d/desktop.mk index b150969d..a681fd64 100644 --- a/conf.d/desktop.mk +++ b/conf.d/desktop.mk @@ -6,8 +6,8 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @: -mixin/desktop-installer: use/x11-autostart use/sound +net-eth +vmguest - @$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo) +mixin/desktop-installer: +net-eth +vmguest \ + use/x11-autostart use/fonts/install2 use/sound @$(call add,BASE_LISTS, \ $(call tags,(base || desktop) && (l10n || network))) @$(call add,INSTALL2_PACKAGES,ntfs-3g) diff --git a/features.in/fonts/config.mk b/features.in/fonts/config.mk index 6f46d5c2..6f12d3e5 100644 --- a/features.in/fonts/config.mk +++ b/features.in/fonts/config.mk @@ -4,6 +4,10 @@ use/fonts: @$(call xport,FONT_FEATURES_ENABLE) @$(call xport,FONT_FEATURES_DISABLE) +# standalone target to specify non-bitmap installer fonts +use/fonts/install2: + @$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo) + # just stating that kernels and font habits are pretty individual use/fonts/zerg: use/fonts @$(call set,FONT_FEATURES_ENABLE,antialias lcdfilter-default \ diff --git a/features.in/install2/config.mk b/features.in/install2/config.mk index 291eee88..20c70dae 100644 --- a/features.in/install2/config.mk +++ b/features.in/install2/config.mk @@ -19,6 +19,9 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \ use/install2/full: use/install2/packages use/install2/vmguest \ use/syslinux/localboot.cfg use/syslinux/ui/menu use/bootloader; @: +# just an alias, better use its endpoint directly +use/install2/fonts: use/fonts/install2 + # see also use/vmguest use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @: