From 333f05e3e5e982f7195752b576ad501b2354197a Mon Sep 17 00:00:00 2001
From: Andrey Cherepanov <cas@altlinux.org>
Date: Fri, 17 May 2019 16:42:29 +0300
Subject: [PATCH] education.mk, education/live: move from use/slinux/full

Copy all features and lists from use/slinux/full and stop reusing it.
---
 conf.d/education.mk         | 36 ++++++++++++++++++++++++++++++------
 pkg.in/lists/education/live | 15 +++++++++++++++
 2 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 pkg.in/lists/education/live

diff --git a/conf.d/education.mk b/conf.d/education.mk
index 320fe7a0..c7d59f52 100644
--- a/conf.d/education.mk
+++ b/conf.d/education.mk
@@ -3,18 +3,26 @@
 ifeq (distro,$(IMAGE_CLASS))
 
 distro/education: distro/alt-education
-distro/alt-education: distro/.installer use/slinux/full \
+distro/alt-education: distro/.installer \
+	+systemd \
 	use/memtest \
 	use/services \
-	use/live/install use/live/suspend use/live/x11 use/live/repo \
+	use/live/install use/live/suspend use/live/x11 use/live/repo use/live/x11 use/live/rw \
 	use/install2/vnc use/install2/full \
-	use/l10n/default/ru_RU +vmguest +efi \
-	use/efi/refind use/efi/shell \
+	use/l10n/default/ru_RU +vmguest \
+	+efi use/efi/refind use/efi/shell \
 	use/ntp/chrony \
-	+systemd
+	use/isohybrid use/x11/xorg use/x11/lightdm/gtk +pulse use/luks \
+	+plymouth +nm use/x11/gtk/nm +wireless \
+	use/xdg-user-dirs/deep use/install2/fonts \
+	use/branding/complete
+	@$(call add_feature)
 	@$(call set,INSTALLER,junior)
 	@$(call set,BRANDING,alt-education)
+	@$(call add,THE_BRANDING,menu xfce-settings system-settings)
+	@$(call set,META_APP_ID,$(DISTRO_VERSION)/$(ARCH))
 	@$(call set,META_VOL_SET,ALT Education 8.2)
+	@$(call set,META_PUBLISHER,BaseALT Ltd)
 	@$(call add,INSTALL2_PACKAGES,disable-usb-autosuspend)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-samba-usershares-stage2)
 	@$(call add,BASE_LISTS,education/base)
@@ -41,5 +49,21 @@ distro/alt-education: distro/.installer use/slinux/full \
 	@$(call add,THE_LISTS,$(call tags,base regular))
 	@$(call add,SERVICES_ENABLE,bluetoothd sshd bind crond alteratord cups ahttpd)
 	@$(call add,STAGE1_MODLISTS,stage2-mmc)
-
+	@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
+	@$(call set,KFLAVOURS,std-def)
+	@$(call add,THE_LISTS,gnome-p2p)
+	@$(call add,LIVE_LISTS,education/live)
+	@$(call add,LIVE_LISTS,slinux/network-base)
+	@$(call add,THE_LISTS,slinux/misc-base)
+	@$(call add,THE_LISTS,slinux/xfce-base)
+	@$(call add,THE_LISTS,$(call tags,base l10n))
+	@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
+	@$(call add,STAGE2_PACKAGES,chrony)
+	@$(call add,THE_KMODULES,staging)
+	@$(call add,STAGE1_MODLISTS,stage2-mmc)
+	@$(call add,MAIN_LISTS,slinux/not-install-full)
+	@$(call add,THE_LISTS,slinux/misc-full)
+	@$(call add,THE_KMODULES,virtualbox)
+	@$(call add,THE_KMODULES,nvidia)
+	@$(call add,MAIN_KMODULES,bbswitch)
 endif
diff --git a/pkg.in/lists/education/live b/pkg.in/lists/education/live
new file mode 100644
index 00000000..a50b624e
--- /dev/null
+++ b/pkg.in/lists/education/live
@@ -0,0 +1,15 @@
+# Multimedia
+vlc-maxi
+simplescreenrecorder
+libva-driver-intel
+libva-driver-vdpau
+
+# Games
+gnome-games-gnomine
+gnome-games-gnotravex
+gnome-games-gnotski
+gnome-games-mahjongg
+gnome-games-sol
+
+# Other
+livecd-timezone