Skip to content

M
mkimage-profiles
Commit f31e392c authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

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.
parent a211aec7
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
conf.d/regular.mk
View file @ f31e392c
...@@ -54,7 +54,7 @@ distro/regular-jeos: distro/.regular-bare use/isohybrid +sysvinit \ ...@@ -54,7 +54,7 @@ distro/regular-jeos: distro/.regular-bare use/isohybrid +sysvinit \
use/install2/packages use/install2/vmguest use/vmguest/base \ use/install2/packages use/install2/vmguest use/vmguest/base \
use/branding use/bootloader/lilo use/syslinux/lateboot.cfg \ use/branding use/bootloader/lilo use/syslinux/lateboot.cfg \
use/install2/cleanup/everything use/install2/cleanup/kernel/everything \ 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 add,BASE_KMODULES,guest scsi vboxguest)
@$(call set,INSTALLER,altlinux-generic) @$(call set,INSTALLER,altlinux-generic)
@$(call add,INSTALL2_BRANDING,alterator notes) @$(call add,INSTALL2_BRANDING,alterator notes)
......
features.in/net-eth/config.mk
View file @ f31e392c
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# see also use/stage2/net-eth; do not depend on it though # see also use/stage2/net-eth; do not depend on it though
# as stage2-less images need preconfigured networking too # as stage2-less images need preconfigured networking too
use/net-eth: use/net use/net-eth: use/net/etcnet
@$(call add_feature) @$(call add_feature)
@$(call xport,NET_ETH) @$(call xport,NET_ETH)
@$(call add,BASE_PACKAGES,udev-rule-generator-net) @$(call add,BASE_PACKAGES,udev-rule-generator-net)
......
features.in/net/config.mk
View file @ f31e392c
...@@ -2,9 +2,12 @@ ...@@ -2,9 +2,12 @@
use/net: use/services use/net: use/services
@$(call add_feature) @$(call add_feature)
@$(call add,THE_PACKAGES,etcnet) @$(call add,THE_PACKAGES,network-config-subsystem)
@$(call add,DEFAULT_SERVICES_ENABLE,network) @$(call add,DEFAULT_SERVICES_ENABLE,network)
use/net/etcnet: use/net
@$(call add,THE_PACKAGES,etcnet)
use/net/dhcp: use/net use/net/dhcp: use/net
@$(call add,THE_PACKAGES,dhcpcd) @$(call add,THE_PACKAGES,dhcpcd)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment