ve.mk: refactor those ve/systemd-* dups

59942221 · Anton Midyukov · 7879bb9c · 59942221
Commit 59942221 authored Oct 25, 2021 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

ve.mk conf.d/ve.mk +3 -5

No files found.
--- a/conf.d/ve.mk
+++ b/conf.d/ve.mk
@@ -45,15 +45,13 @@ ve/systemd-bare: ve/.apt use/init/systemd \
 	use/control/sudo-su use/repo use/net-ssh
 	@$(call add,BASE_PACKAGES,interactivesystem su)

-ve/systemd-networkd: ve/systemd-bare use/net/networkd/resolved
+ve/systemd-base: ve/systemd-bare
 	@$(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/systemd-networkd: ve/systemd-base use/net/networkd/resolved; @:
+ve/systemd-etcnet: ve/systemd-base use/net/etcnet; @:

 ve/.lxc-bare: use/lxc-guest
 	@$(call add,NET_ETH,eth0:dhcp)