From fae0bb94e72a0aa169353a99ca048d7578f7c6bd Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Mon, 7 Aug 2017 17:58:26 +0300 Subject: [PATCH] e2k.mk: vm/e2k-xfce Let's build an Xfce based image, got anything needed (well, almost: xorg-drv-libinput isn't there and no one is crying over that here). And let's change "e2k" suffix to be prefix while at that. --- conf.d/e2k.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/conf.d/e2k.mk b/conf.d/e2k.mk index ec657766..778f95ec 100644 --- a/conf.d/e2k.mk +++ b/conf.d/e2k.mk @@ -1,12 +1,16 @@ ifeq (vm,$(IMAGE_CLASS)) -vm/live-e2k: vm/bare use/e2k use/deflogin/live +vm/e2k-live: vm/bare use/e2k use/deflogin/live use/control/sudo-su @$(call add,THE_PACKAGES,openssh) @$(call add,THE_LISTS,$(call tags,ve tools)) -vm/rescue-e2k: vm/live-e2k use/tty/S0 use/net-eth/dhcp use/services/lvm2-disable +vm/e2k-rescue: vm/e2k-live use/tty/S0 use/net-eth/dhcp use/services/lvm2-disable @$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs) @$(call add,THE_LISTS,$(call tags,server && (network || extra))) @$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd) +vm/e2k-xfce: vm/e2k-rescue use/e2k/x11 use/x11/xfce \ + use/l10n/default/ru_RU use/fonts/otf/adobe use/fonts/otf/mozilla + @$(call add,THE_PACKAGES,xinit xterm firefox mc) + endif