desktop.mk: refactor net-eth usage with +net-eth

It was spilled over an intermediate target and a mixin for what looks like no good reason; let's factor these in by means of +net-eth as *both* are really needed for an installer anyways, and if/when we do installers with those new and crippled ethernet interface names this addition can be dropped to be used where required.

desktop.mk: refactor net-eth usage with +net-eth
559714a2 · Michael Shigorin · 7c9794a8 · 559714a2
Commit 559714a2 authored Aug 26, 2014 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

desktop.mk conf.d/desktop.mk +2 -3

No files found.
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -6,15 +6,14 @@ 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/net-eth use/sound +vmguest
+mixin/desktop-installer: use/x11-autostart use/sound +net-eth +vmguest
 	@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
 	@$(call add,BASE_LISTS, \
 		$(call tags,(base || desktop) && (l10n || network)))
 	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
 	@$(call add,BASE_PACKAGES,os-prober)
-distro/.desktop-network: distro/.desktop-mini \
+distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:
-	mixin/desktop-installer use/stage2/net-eth; @:
 distro/.desktop-extra:
 	@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))