mixin.mk, regular-vm.mk, regular.mk: do not use udev-rule-generator-net

conf.d/mixin.mk

@@ -69,7 +69,7 @@ endif
 mixin/desktop-extra:
 	@$(call add,BASE_LISTS,$(call tags,(archive || base) && extra))
 
-mixin/regular-wmaker: use/fonts/ttf/redhat use/x11/wmaker
+mixin/regular-wmaker: use/fonts/ttf/redhat use/x11/wmaker +nm-gtk
 	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
 	@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
 	@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)

conf.d/regular-vm.mk

@@ -31,8 +31,10 @@ endif
 	@$(call add,KMODULES,staging)
 	@$(call set,VM_SIZE,7516192768)
 
-mixin/regular-vm-jeos: mixin/regular-vm-base use/deflogin/root
-	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1)
+mixin/regular-vm-jeos: mixin/regular-vm-base use/deflogin/root \
+	use/net/etcnet use/net/dhcp
+	@$(call add,THE_PACKAGES,livecd-net-eth)
+	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 livecd-net-eth)
 
 mixin/regular-vm-x11:: mixin/regular-vm-base mixin/regular-x11 \
 	mixin/regular-desktop use/oem +wireless; @:
@@ -53,18 +55,18 @@ vm/.regular-desktop::
 endif
 
 vm/.regular-desktop-sysv: vm/bare mixin/regular-vm-x11 use/x11/gdm2.20 \
-	use/init/sysv/polkit use/net-eth +power; @:
+	use/init/sysv/polkit +power; @:
 
 vm/.regular-gtk: vm/.regular-desktop use/x11/lightdm/gtk
 	@$(call add,THE_PACKAGES,blueberry)
 
 vm/.regular-qt: vm/.regular-desktop use/x11/sddm; @:
 
-vm/regular-jeos-systemd: vm/systemd-net \
+vm/regular-jeos-systemd: vm/systemd \
 	mixin/regular-vm-jeos mixin/vm-archdep
 	@$(call add,THE_PACKAGES,glibc-locales)
 
-vm/regular-jeos-sysv: vm/net mixin/regular-vm-jeos mixin/vm-archdep +power; @:
+vm/regular-jeos-sysv: vm/bare mixin/regular-vm-jeos mixin/vm-archdep +power; @:
 
 vm/regular-builder: vm/regular-jeos-systemd mixin/regular-builder; @:
 

conf.d/regular.mk

@@ -43,7 +43,7 @@ distro/.regular-desktop: distro/.regular-wm use/branding/full \
 
 distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
 
-distro/.regular-desktop-sysv: distro/.regular-wm use/init/sysv/polkit +net-eth; @:
+distro/.regular-desktop-sysv: distro/.regular-wm use/init/sysv/polkit; @:
 
 distro/.regular-gtk-sysv: distro/.regular-desktop-sysv \
 	use/syslinux/ui/gfxboot use/x11/gdm2.20; @:
@@ -246,8 +246,9 @@ distro/regular-server-pve: distro/.regular-server-base +systemd \
 distro/regular-builder: distro/.regular-bare mixin/regular-builder \
 	use/dev/builder/full use/stage2/kms +sysvinit +efi +power \
 	use/live/base use/live/rw use/live/repo/online use/live/textinstall \
-	use/isohybrid use/syslinux/timeout/300 use/grub/timeout/30 use/stage2/net-eth
+	use/isohybrid use/syslinux/timeout/300 use/grub/timeout/30
 	@$(call add,THE_PACKAGES,ccache cifs-utils wodim)
+	@$(call add,THE_PACKAGES,livecd-net-eth)
 
 distro/regular-server-samba4: distro/.regular-server-managed +systemd
 	@$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator)))