Skip to content

M
mkimage-profiles
You need to sign in or sign up before continuing.
Commit b558f88b authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

vm.mk: factor out mixin/cloud-init

This one has been clearly duplicated before.
parent ef0394f8
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
conf.d/vm.mk
View file @ b558f88b
...@@ -17,17 +17,18 @@ vm/systemd-net: vm/systemd use/net-eth/networkd-dhcp use/net-ssh \ ...@@ -17,17 +17,18 @@ vm/systemd-net: vm/systemd use/net-eth/networkd-dhcp use/net-ssh \
use/repo use/control/sudo-su use/deflogin use/repo use/control/sudo-su use/deflogin
@$(call add,BASE_PACKAGES,su) @$(call add,BASE_PACKAGES,su)
# vm/net or vm/systemd-net mixin/cloud-init:
vm/cloud-systemd: vm/systemd-net use/vmguest/kvm
@$(call add,BASE_PACKAGES,cloud-init) @$(call add,BASE_PACKAGES,cloud-init)
@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local) @$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final)
@$(call add,DEFAULT_SERVICES_ENABLE,cloud-init cloud-init-local)
# vm/net or vm/systemd-net
vm/cloud-systemd: vm/systemd-net mixin/cloud-init use/vmguest/kvm
@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver) @$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
@$(call add,THE_KMODULES,kdbus) @$(call add,THE_KMODULES,kdbus)
vm/cloud-sysv: vm/net use/vmguest/kvm use/power/acpi/button vm/cloud-sysv: vm/net mixin/cloud-init use/vmguest/kvm use/power/acpi/button; @:
@$(call add,BASE_PACKAGES,cloud-init)
@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
# NB: use/x11 employs some installer-feature packages # NB: use/x11 employs some installer-feature packages
vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @: vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
......
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