altcloud/mkimage-profiles
2
0
Fork 3
Code Issues Pull Requests Releases Wiki Activity

net: rework towards a switch variable

Browse Source 
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
This commit is contained in:
Michael Shigorin 2018-05-24 17:15:02 +03:00
parent 49ce23470e
commit 8a5a9fd2d8
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
features.in/net/config.mk
View File

@ -2,10 +2,11 @@
use/net: use/services
@$(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
@$(call add,THE_PACKAGES,etcnet)
@$(call set,THE_NET_SUBSYS,etcnet)
@$(call add,DEFAULT_SERVICES_ENABLE,network)
use/net/dhcp: use/net
@ -13,9 +14,10 @@ use/net/dhcp: use/net
# base service, no GUI; see x11 feature for those
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,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,livecd-save-nfs) # keep interface up
@ -23,12 +25,12 @@ use/net/nm/nodelay: use/net/nm
@$(call add,DEFAULT_SERVICES_DISABLE,NetworkManager-wait-online)
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
@$(call add,THE_PACKAGES,connman)
@$(call set,THE_NET_SUBSYS,connman)
@$(call add,DEFAULT_SERVICES_ENABLE,connmand connman)
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)