ve.mk, vm.mk: add packages for lxc and cloud images

1) systemd-settings-disable-kill-user-processes - server systems should not kill processes after user exit; 2) apt-scripts - for apt-dedup; 3) update-kernel - to update kernel on vm cloud image.

ve.mk, vm.mk: add packages for lxc and cloud images
621afbee · Mikhail Gordeev · 4682e8d1 · 621afbee · 621afbee
Commit 621afbee authored Aug 18, 2021 by Mikhail Gordeev
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

ve.mk conf.d/ve.mk +4 -0

vm.mk conf.d/vm.mk +3 -0

No files found.
--- a/conf.d/ve.mk
+++ b/conf.d/ve.mk
@@ -46,9 +46,13 @@ ve/systemd-bare: ve/.apt use/init/systemd \
 	@$(call add,BASE_PACKAGES,interactivesystem su)

 ve/systemd-networkd: ve/systemd-bare use/net/networkd
+	@$(call add,BASE_PACKAGES,apt-scripts)
+	@$(call add,BASE_PACKAGES,systemd-settings-disable-kill-user-processes)
 	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)

 ve/systemd-etcnet: ve/systemd-bare use/net/etcnet
+	@$(call add,BASE_PACKAGES,apt-scripts)
+	@$(call add,BASE_PACKAGES,systemd-settings-disable-kill-user-processes)
 	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)

 ve/lxc-sysvinit-etcnet: ve/sysvinit-etcnet use/net-eth use/lxc-guest

--- a/conf.d/vm.mk
+++ b/conf.d/vm.mk
@@ -21,6 +21,9 @@ vm/systemd-net: vm/systemd use/net-eth/networkd-dhcp use/net-ssh \
 # vm/net or vm/systemd-net
 vm/cloud-systemd: vm/systemd-net mixin/cloud-init use/vmguest/kvm use/tty/S0
 	@$(call add,THE_KMODULES,drm)
+	@$(call add,BASE_PACKAGES,update-kernel)
+	@$(call add,BASE_PACKAGES,apt-scripts)
+	@$(call add,BASE_PACKAGES,systemd-settings-disable-kill-user-processes)
 	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 getty@ttyS0)
 	@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)