regular.mk: explicitly add NM to a few images

As it happens regular-rc testing has shown that cinnamon, gnome3 and kde4 flavours included NM via their pkglists and dependencies (which used to result in live feature enabling NetworkManager service wholesale when found); now when handling default services has become more strict it became apparent that these images have got their LiveCD mode running without network by default (installation does set that up though). It looks like an easy way to just stick +nm into .regular-desktop dependencies but then razorqt, sugar, xmonad would get NM which is not what they're gonna handle; e17/e18 too.

regular.mk: explicitly add NM to a few images
187d3ded · Michael Shigorin · 719144f6 · 187d3ded
Commit 187d3ded authored Mar 18, 2014 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

regular.mk conf.d/regular.mk +4 -3

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -103,10 +103,11 @@ distro/regular-e18: distro/.regular-gtk use/x11/e18 use/fonts/infinality; @:
 distro/regular-e18-sysv: distro/.regular-sysv-gtk use/x11/e18; @:
 distro/regular-cinnamon: distro/.regular-gtk \
-	use/x11/cinnamon use/fonts/infinality
+	use/x11/cinnamon use/fonts/infinality +nm
 	@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
-distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3 +plymouth; @:
+# not .regular-gtk due to gdm vs lightdm
+distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3 +plymouth +nm; @:
 # reusable bits
 mixin/regular-tde: use/syslinux/ui/gfxboot +tde +plymouth
@@ -119,7 +120,7 @@ distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
 	use/net-eth/dhcp use/efi/refind; @:
 distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \
-	use/fonts/zerg +pulse +plymouth
+	use/fonts/zerg +pulse +plymouth +nm
 	@$(call add,LIVE_LISTS,$(call tags,regular kde4))
 distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @: