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.
This commit is contained in:
Michael Shigorin 2015-02-24 23:47:39 +03:00
parent a211aec73c
commit f31e392ca4
3 changed files with 6 additions and 3 deletions

View File

@ -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)

View File

@ -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)

View File

@ -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)