net, services: in Soviet Russia...

...net uses services, not services use net. That is, "network" is a service that needs to be enabled by the now-existing mechanism of "services" feature, don't be fooled by "network services" here.

net, services: in Soviet Russia...
a97ef4c9 · Michael Shigorin · 6889a65e · a97ef4c9 · a97ef4c9
Commit a97ef4c9 authored Jun 25, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

config.mk features.in/net/config.mk +1 -1

config.mk features.in/services/config.mk +2 -4

No files found.
--- a/features.in/net/config.mk
+++ b/features.in/net/config.mk
 +nm: use/net/nm; @:

-use/net:
+use/net: use/services
 	@$(call add_feature)
 	@$(call add,THE_PACKAGES,etcnet)
 	@$(call add,DEFAULT_SERVICES_ENABLE,network)

--- a/features.in/services/config.mk
+++ b/features.in/services/config.mk
@@ -7,8 +7,6 @@ use/services: sub/rootfs

 # some presets

-use/services/network: use/services
-	@$(call add,DEFAULT_SERVICES_ENABLE,network)
-
-use/services/ssh: use/services use/services/network
+use/services/ssh: use/services use/net
+	@$(call add,THE_LISTS,openssh)
 	@$(call add,DEFAULT_SERVICES_ENABLE,sshd)