From 78f21583cb04410c989682bf45989b08457547f5 Mon Sep 17 00:00:00 2001
From: Michael Shigorin <mike@altlinux.org>
Date: Mon, 9 Jun 2014 20:14:17 +0400
Subject: [PATCH] net: rework NM support

Non-GUI packages moved to base+nm pkglist to enable standalone
installation of those; and GTK bits left in desktop+nm for use
by images lacking their own new and improved(tm) variant.

Note that both GNOME3 and KDE4 aren't lacking anymore.
---
 features.in/net/config.mk      |  3 ++-
 pkg.in/lists/tagged/base+nm    | 10 ++++++++++
 pkg.in/lists/tagged/desktop+nm | 18 ++++++++----------
 3 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 pkg.in/lists/tagged/base+nm

diff --git a/features.in/net/config.mk b/features.in/net/config.mk
index 56e1b89a..caf22bf0 100644
--- a/features.in/net/config.mk
+++ b/features.in/net/config.mk
@@ -8,8 +8,9 @@ use/net: use/services
 use/net/dhcp: use/net
 	@$(call add,THE_PACKAGES,dhcpcd)
 
+# base service, no GUI
 use/net/nm: use/net
-	@$(call add,THE_LISTS,$(call tags,desktop nm))
+	@$(call add,THE_LISTS,$(call tags,base nm))
 	@$(call add,LIVE_PACKAGES,livecd-save-nfs)
 	@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)
 	@$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs) # keep interface up
diff --git a/pkg.in/lists/tagged/base+nm b/pkg.in/lists/tagged/base+nm
new file mode 100644
index 00000000..102bb060
--- /dev/null
+++ b/pkg.in/lists/tagged/base+nm
@@ -0,0 +1,10 @@
+NetworkManager
+
+NetworkManager-vpnc
+NetworkManager-openvpn
+NetworkManager-pptp
+
+# this one pulls strongswan, a bit too much?
+#NetworkManager-l2tp
+
+usb-modeswitch
diff --git a/pkg.in/lists/tagged/desktop+nm b/pkg.in/lists/tagged/desktop+nm
index 11c4e711..f3dd881d 100644
--- a/pkg.in/lists/tagged/desktop+nm
+++ b/pkg.in/lists/tagged/desktop+nm
@@ -1,10 +1,8 @@
-NetworkManager
-NetworkManager-vpnc
-NetworkManager-openvpn
-NetworkManager-pptp
-#NetworkManager-l2tp
-NetworkManager-openvpn-gnome
-NetworkManager-pptp-gnome
-NetworkManager-vpnc-gnome
-#NetworkManager-l2tp-gnome
-usb-modeswitch
+NetworkManager-applet-gtk
+
+NetworkManager-openvpn-gtk
+NetworkManager-pptp-gtk
+NetworkManager-vpnc-gtk
+
+# pulls in strongswan
+#NetworkManager-l2tp-gtk