Skip to content

M
mkimage-profiles
Commit 8a5a9fd2 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

net: rework towards a switch variable

The common problem was network-config-subsystem getting resolved into something completely wrong (like net-scripts or systemd-networkd) *before* it got specified precisely; let's just avoid the common cause, that is, a metapackage. See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=30806
parent 49ce2347
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 7 deletions
features.in/net/config.mk
View file @ 8a5a9fd2
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
use/net: use/services use/net: use/services
@$(call add_feature) @$(call add_feature)
@$(call add,THE_PACKAGES,network-config-subsystem) @$(call add,THE_PACKAGES,$$(THE_NET_SUBSYS))
@$(call set,THE_NET_SUBSYS,network-config-subsystem)
use/net/etcnet: use/net use/net/etcnet: use/net
@$(call add,THE_PACKAGES,etcnet) @$(call set,THE_NET_SUBSYS,etcnet)
@$(call add,DEFAULT_SERVICES_ENABLE,network) @$(call add,DEFAULT_SERVICES_ENABLE,network)
use/net/dhcp: use/net use/net/dhcp: use/net
...@@ -13,9 +14,10 @@ use/net/dhcp: use/net ...@@ -13,9 +14,10 @@ use/net/dhcp: use/net
# base service, no GUI; see x11 feature for those # base service, no GUI; see x11 feature for those
use/net/nm: use/net use/net/nm: use/net
@$(call add,THE_LISTS,$(call tags,base nm)) @$(call set,THE_NET_SUBSYS,NetworkManager)
@$(call add,THE_LISTS,$(call tags,base nm)) # NB: won't get overridden
@$(call add,LIVE_PACKAGES,livecd-save-nfs) @$(call add,LIVE_PACKAGES,livecd-save-nfs)
@$(call add,DEFAULT_SERVICES_ENABLE,network) # need for NM? @$(call add,DEFAULT_SERVICES_ENABLE,network) # need for NM?
@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager) @$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)
@$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs) # keep interface up @$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs) # keep interface up
...@@ -23,12 +25,12 @@ use/net/nm/nodelay: use/net/nm ...@@ -23,12 +25,12 @@ use/net/nm/nodelay: use/net/nm
@$(call add,DEFAULT_SERVICES_DISABLE,NetworkManager-wait-online) @$(call add,DEFAULT_SERVICES_DISABLE,NetworkManager-wait-online)
use/net/nm/mmgui: use/net/nm use/net/nm/mmgui: use/net/nm
@$(call add,THE_PACKAGES,modem-manager-gui) @$(call set,THE_NET_SUBSYS,modem-manager-gui)
use/net/connman: use/net use/net/connman: use/net
@$(call add,THE_PACKAGES,connman) @$(call set,THE_NET_SUBSYS,connman)
@$(call add,DEFAULT_SERVICES_ENABLE,connmand connman) @$(call add,DEFAULT_SERVICES_ENABLE,connmand connman)
use/net/networkd: use/net use/net/networkd: use/net
@$(call add,THE_PACKAGES,systemd-networkd) @$(call set,THE_NET_SUBSYS,systemd-networkd)
@$(call add,DEFAULT_SERVICES_ENABLE,systemd-networkd) @$(call add,DEFAULT_SERVICES_ENABLE,systemd-networkd)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment