From a97ef4c9057a84c75646eb277204d472e3408387 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 25 Jun 2013 21:59:47 +0400 Subject: [PATCH] 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. --- features.in/net/config.mk | 2 +- features.in/services/config.mk | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/features.in/net/config.mk b/features.in/net/config.mk index a96119ab..8f77eb05 100644 --- a/features.in/net/config.mk +++ b/features.in/net/config.mk @@ -1,6 +1,6 @@ +nm: use/net/nm; @: -use/net: +use/net: use/services @$(call add_feature) @$(call add,THE_PACKAGES,etcnet) @$(call add,DEFAULT_SERVICES_ENABLE,network) diff --git a/features.in/services/config.mk b/features.in/services/config.mk index 23718db3..060f052e 100644 --- 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)