net-eth: added plus-shortcut

"use/stage2/net-eth use/net-eth" would be common enough for installers or livecd images to just get these pulled in together by a convenient shortcut thus reducing confusion and chances to just forget one of these counterparts.

net-eth: added plus-shortcut
8533f7e2 · Michael Shigorin · 2a0482ce · 8533f7e2 · 8533f7e2
Commit 8533f7e2 authored Aug 26, 2014 by Michael Shigorin
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

README features.in/net-eth/README +3 -0

config.mk features.in/net-eth/config.mk +5 -3

No files found.
--- a/features.in/net-eth/README
+++ b/features.in/net-eth/README
@@ -5,3 +5,6 @@ udev-rule-generator-net штатно добавляется для обеспе
 сломали в апстримном systemd-udevd; для генерируемых "на лету"
 следует применять конфигурирование времени загрузки (NM, connman
 либо пакет livecd-net-eth).
+
+Обратите внимание: применение в инсталяторах требует задействования
+как use/net-eth, так и use/stage2/net-eth; +net-eth "подберёт" оба.
--- a/features.in/net-eth/config.mk
+++ b/features.in/net-eth/config.mk
+# NB: this is aimed at LiveCD/installer images
+net-eth: use/net-eth use/stage2/net-eth
+
+# see also use/stage2/net-eth; do not depend on it though
+# as stage2-less images need preconfigured networking too
 use/net-eth: use/net
 	@$(call add_feature)
 	@$(call xport,NET_ETH)
 	@$(call add,BASE_PACKAGES,udev-rule-generator-net)

-# see also use/stage2/net-eth; do not depend on it though
-# as stage2-less images need preconfigured networking too
-
 # typical boilerplate
 use/net-eth/dhcp: use/net-eth use/net/dhcp
 	@$(call add,NET_ETH,eth0:dhcp)