Commit 58b05501 authored by Anton Midyukov's avatar Anton Midyukov

mixin.mk: remove condition BRANCH from mixin/cloud-init for enable services

There is nothing wrong with enable services that do not exist. cloud-init has been updated in branches except p10. Reported-by: fedor@
parent 36c7ce0f
......@@ -209,9 +209,7 @@ mixin/regular-builder: use/dev/builder/base use/net/dhcp use/ntp/chrony
### vm.mk
mixin/cloud-init:
@$(call add,BASE_PACKAGES,cloud-init)
ifeq (sisyphus,$(BRANCH))
@$(call add,DEFAULT_SERVICES_ENABLE,cloud-init-main cloud-init-network)
endif
@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final)
@$(call add,DEFAULT_SERVICES_ENABLE,cloud-init cloud-init-local)
@$(call set,GLOBAL_NET_ETH,)
......
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