net: Added switch between NetworkManager (etcnet) and NetworkManager (native)

NetworkManager (etcnet) is default now.

features.in/net/config.mk

@@ -1,4 +1,5 @@
 +nm: use/net/nm; @:
++nm-native: use/net/nm/native; @:
 
 use/net: use/services use/pkgpriorities
 	@$(call add_feature)
@@ -21,6 +22,11 @@ use/net/nm: use/net
 	@$(call add,DEFAULT_SERVICES_ENABLE,network) # need for NM?
 	@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)
 	@$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs) # keep interface up
+	@$(call xport,NM_native)
+
+# use NetworkManager(native)
+use/net/nm/native: use/net/nm
+	@$(call set,NM_Native,yes)
 
 # NOT recommended unless you know what you're doing
 # (e.g. dnsmasq can win a race against dhcpcd)

features.in/net/rootfs/image-scripts.d/50-net-nm

@@ -7,5 +7,9 @@ defcfg=/etc/net/ifaces/default/options-eth
 if  [ -x /usr/sbin/NetworkManager -o -x /usr/sbin/connmand ]; then
 	shell_config_set "$defcfg" NM_CONTROLLED yes
 	shell_config_set "$defcfg" DISABLED yes
-	shell_config_set "$defcfg" BOOTPROTO static
+	if [ NM_Native = 'yes' ]; then
+		shell_config_set "$defcfg" BOOTPROTO static
+	else
+		shell_config_set "$defcfg" BOOTPROTO dhcp
+	fi
 fi