Remove use/stage2/net-eth, +net-eth everything

conf.d/e2k.mk

@@ -50,12 +50,12 @@ ve/e2k-git: ve/.e2k-bare use/e2k use/net-ssh use/net-dns/yandex
 endif
 
 ifeq (distro,$(IMAGE_CLASS))
-distro/.e2k-rescue: distro/.base mixin/e2k-base use/rescue/.base +net-eth
+distro/.e2k-rescue: distro/.base mixin/e2k-base use/rescue/.base
 	@$(call set,META_VOL_ID,ALT Rescue for Elbrus)
 
 distro/.e2k-installer-base: distro/.base mixin/e2k-base \
 	use/install2 use/install2/packages use/e2k \
-	use/volumes/regular use/net-ssh +net-eth
+	use/volumes/regular use/net-ssh
 	@$(call set,INSTALLER,altlinux-generic)
 	@$(call set,META_PUBLISHER,BaseALT Ltd)
 	@$(call set,META_VOL_SET,ALT)

conf.d/live.mk

@@ -38,7 +38,7 @@ distro/rescue: distro/.base use/rescue use/syslinux/ui/menu use/stage2/cifs \
 	use/stage2/ata use/stage2/hid use/stage2/usb \
 	use/efi/shell +efi; @:
 
-distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
+distro/rescue-remote: distro/.base use/rescue/base
 	@$(call set,SYSLINUX_CFG,rescue_remote)
 	@$(call set,SYSLINUX_DIRECT,1)
 	@$(call add,RESCUE_PACKAGES,livecd-net-eth)
@@ -48,25 +48,28 @@ distro/.live-base: distro/.base use/live/base \
 
 distro/.live-x11: distro/.live-base use/live/x11; @:
 
-distro/.live-desktop: distro/.live-x11 +live use/stage2/net-eth \
+distro/.live-desktop: distro/.live-x11 +live \
 	use/plymouth/live use/cleanup/live-no-cleanupdb
 	@$(call add,LIVE_PACKAGES,polkit)
+	@$(call add,LIVE_PACKAGES,livecd-net-eth)
 
 distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:
 
 distro/.live-kiosk: distro/.live-base use/live/autologin \
-	use/syslinux/timeout/1 use/cleanup use/stage2/net-eth \
+	use/syslinux/timeout/1 use/cleanup \
 	use/fonts/otf/adobe
 	@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
 	@$(call set,SYSLINUX_UI,none)
 	@$(call set,SYSLINUX_CFG,live)
 	@$(call add,STAGE2_BOOTARGS,quiet)
+	@$(call add,LIVE_PACKAGES,livecd-net-eth)
 	@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind klogd syslogd)
 	@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver fbsetfont keytable)
 
 distro/live-builder-mini: distro/.live-base use/dev/builder/base \
 	use/syslinux/timeout/30 use/isohybrid use/cleanup/live-no-cleanupdb \
-	use/stage2/net-eth use/net-eth/dhcp +systemd; @:
+	use/net-eth/dhcp +systemd
+	@$(call add,LIVE_PACKAGES,livecd-net-eth)
 
 distro/live-builder: distro/live-builder-mini \
 	use/dev/builder/full use/live/rw +efi; @:
@@ -116,12 +119,12 @@ distro/.live-3d: distro/.live-x11 use/x11/3d \
 distro/live-glxgears: distro/.live-3d; @:
 
 distro/.live-games: distro/.live-kiosk use/x11/3d use/sound \
-	use/stage2/net-eth use/net-eth/dhcp use/services +efi +systemd
+	use/net-eth/dhcp use/services +efi +systemd
 	@$(call add,LIVE_LISTS,$(call tags,xorg misc))
 	@$(call add,LIVE_PACKAGES,pciutils input-utils glxgears glxinfo)
 	@$(call add,LIVE_PACKAGES,glibc-locales apulse)
+	@$(call add,LIVE_PACKAGES,livecd-net-eth)
 	@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind alteratord messagebus)
-	@$(call add,SERVICES_DISABLE,livecd-net-eth)
 
 distro/live-flightgear: distro/.live-games
 	@$(call add,LIVE_PACKAGES,FlightGear)

features.in/net-eth/README

@@ -7,6 +7,3 @@ udev-rule-generator-net штатно добавляется для обеспе
 сломали в апстримном systemd-udevd; для генерируемых "на лету"
 следует применять конфигурирование времени загрузки (NM, connman
 либо пакет livecd-net-eth).
-
-Обратите внимание: применение в инсталяторах требует задействования
-как use/net-eth, так и use/stage2/net-eth; +net-eth "подберёт" оба.

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/etcnet
 	@$(call add_feature)
 	@$(call xport,NET_ETH)

features.in/stage2/config.mk

@@ -51,8 +51,6 @@ use/stage2/net-install-live: use/stage2/net use/stage2/cifs \
 
 # eth0 instead of enp0s3
 use/stage2/net-eth: use/stage2
-	@$(call add,STAGE1_PACKAGES,udev-rule-generator-net)
-	@$(call add,STAGE2_PACKAGES,udev-rule-generator-net livecd-net-eth)
 
 # NB: sub/stage2 isn't used standalone but rather
 #     as a base for various livecd modifications