net, net-eth, regular.mk: introduce use/net/etcnet

This has been simply use/net but it looks like we've got some people who would like to cope without etcnet, even: http://lists.altlinux.org/pipermail/devel/2015-February/199506.html Adjust its usage accordingly.

net, net-eth, regular.mk: introduce use/net/etcnet
f31e392c · Michael Shigorin · a211aec7 · f31e392c · f31e392c · f31e392c
Commit f31e392c authored Feb 24, 2015 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

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

config.mk features.in/net-eth/config.mk +1 -1

config.mk features.in/net/config.mk +4 -1

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -54,7 +54,7 @@ distro/regular-jeos: distro/.regular-bare use/isohybrid +sysvinit \
 	use/install2/packages use/install2/vmguest use/vmguest/base \
 	use/branding use/bootloader/lilo use/syslinux/lateboot.cfg \
 	use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
-	use/cleanup/x11-alterator use/net use/power/acpi/button
+	use/cleanup/x11-alterator use/net/etcnet use/power/acpi/button
 	@$(call add,BASE_KMODULES,guest scsi vboxguest)
 	@$(call set,INSTALLER,altlinux-generic)
 	@$(call add,INSTALL2_BRANDING,alterator notes)

--- a/features.in/net-eth/config.mk
+++ b/features.in/net-eth/config.mk
@@ -3,7 +3,7 @@

 # 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
+use/net-eth: use/net/etcnet
 	@$(call add_feature)
 	@$(call xport,NET_ETH)
 	@$(call add,BASE_PACKAGES,udev-rule-generator-net)

--- a/features.in/net/config.mk
+++ b/features.in/net/config.mk
@@ -2,9 +2,12 @@

 use/net: use/services
 	@$(call add_feature)
-	@$(call add,THE_PACKAGES,etcnet)
+	@$(call add,THE_PACKAGES,network-config-subsystem)
 	@$(call add,DEFAULT_SERVICES_ENABLE,network)

+use/net/etcnet: use/net
+	@$(call add,THE_PACKAGES,etcnet)
+
 use/net/dhcp: use/net
 	@$(call add,THE_PACKAGES,dhcpcd)