From bc2b4ba47f38436c82aabc87de2c6be7e05c4b9f Mon Sep 17 00:00:00 2001 From: Andrey Cherepanov Date: Thu, 16 May 2019 21:32:15 +0300 Subject: [PATCH] education.mk: remove education software from LiveCD --- conf.d/education.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conf.d/education.mk b/conf.d/education.mk index 3f507600..320fe7a0 100644 --- a/conf.d/education.mk +++ b/conf.d/education.mk @@ -17,8 +17,8 @@ distro/alt-education: distro/.installer use/slinux/full \ @$(call set,META_VOL_SET,ALT Education 8.2) @$(call add,INSTALL2_PACKAGES,disable-usb-autosuspend) @$(call add,INSTALL2_PACKAGES,installer-feature-samba-usershares-stage2) - @$(call add,THE_LISTS,education/base) - @$(call add,THE_LISTS,workstation/3rdparty) + @$(call add,BASE_LISTS,education/base) + @$(call add,BASE_LISTS,workstation/3rdparty) @$(call add,MAIN_GROUPS,education/01_preschool) @$(call add,MAIN_GROUPS,education/02_gradeschool) @$(call add,MAIN_GROUPS,education/03_highschool) @@ -29,13 +29,13 @@ distro/alt-education: distro/.installer use/slinux/full \ @$(call add,MAIN_GROUPS,education/server-apps-edu) @$(call add,THE_KMODULES,lsadrv bbswitch) @$(call add,THE_PACKAGES,usbutils pv syslinux lftp links2 openssh-server xinput xorg-drv-libinput) + @$(call add,THE_PACKAGES,net-tools fdisk gdisk parted partclone) @$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse disable-usb-autosuspend) @$(call add,THE_PACKAGES,bluez pulseaudio-bluez) - @$(call add,THE_PACKAGES,os-prober) - @$(call add,THE_PACKAGES,guest-account) - @$(call add,THE_PACKAGES,nextcloud-client) @$(call add,THE_PACKAGES,alterator-fbi) - @$(call add,THE_PACKAGES,net-tools fdisk gdisk parted partclone) + @$(call add,BASE_PACKAGES,os-prober) + @$(call add,BASE_PACKAGES,guest-account) + @$(call add,BASE_PACKAGES,nextcloud-client) @$(call add,MAIN_PACKAGES,iperf3 owamp-server) @$(call add,MAIN_PACKAGES,stellarium) @$(call add,THE_LISTS,$(call tags,base regular))