net-eth: moved from regular.mk to live feature

It'd be better for this commit to appear before 0.9.7
(and clobber the original one) but at least the added
functionality has been tested; time to generalize it.

conf.d/regular.mk

@@ -3,14 +3,12 @@ ifeq (distro,$(IMAGE_CLASS))
 
 # TODO: use/plymouth/live when luks+plymouth is done, see also #28255
 distro/.regular-desktop: distro/.base +live +wireless use/live/ru \
-	use/live/install use/live/repo use/x11/3d-free use/systemd \
-	use/firmware/wireless use/efi/signed use/luks \
+	use/live/install use/live/repo use/live/net-eth use/x11/3d-free \
+	use/systemd use/firmware/wireless use/efi/signed use/luks \
 	+vmguest use/memtest use/branding use/syslinux/ui/gfxboot
 	@$(call add,LIVE_LISTS,$(call tags,base regular))
 	@$(call add,LIVE_LISTS,$(call tags,rescue extra))
 	@$(call add,LIVE_LISTS,domain-client)
-	@$(call add,STAGE1_PACKAGES,udev-rule-generator-net)
-	@$(call add,STAGE2_PACKAGES,udev-rule-generator-net)
 	@$(call add,THE_BRANDING,indexhtml notes alterator bootloader)
 	@$(call set,KFLAVOURS,std-def)
 	@$(call add,KMODULES,r8168)

features.in/live/config.mk

@@ -52,3 +52,8 @@ use/live/ru: use/live
 
 use/live/sound: use/live
 	@$(call add,LIVE_PACKAGES,amixer alsa-utils aplay udev-alsa)
+
+# eth0 instead of enp0s3
+use/live/net-eth: use/live
+	@$(call add,STAGE1_PACKAGES,udev-rule-generator-net)
+	@$(call add,STAGE2_PACKAGES,udev-rule-generator-net livecd-net-eth)

pkg.in/lists/tagged/base+regular

@@ -5,7 +5,6 @@ strace
 powertop
 acpi
 
-livecd-net-eth
 livecd-online-repo
 apt-repo
 update-kernel