From 5a756d29265de1bfd21c97805c8e23a66a9e0b92 Mon Sep 17 00:00:00 2001
From: "Anton V. Boyarshinov" <boyarsh@altlinux.org>
Date: Mon, 8 Jun 2020 18:06:07 +0300
Subject: [PATCH] alt-server: minimazing minimum installation

---
 conf.d/alt-server.mk                |  4 +++-
 conf.d/mixin-alt-server.mk          |  7 ++++---
 pkg.in/lists/centaurus/10-alterator |  4 ----
 pkg.in/lists/centaurus/mate         | 22 ++++++++++++++++++++++
 pkg.in/lists/centaurus/xorg         | 17 +++++++++++++++--
 5 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/conf.d/alt-server.mk b/conf.d/alt-server.mk
index f5bc3708..f4ea29fc 100644
--- a/conf.d/alt-server.mk
+++ b/conf.d/alt-server.mk
@@ -20,7 +20,7 @@ endif
 
 # FIXME: generalize vm-profile
 distro/alt-server: distro/.base distro/.alt-server-vnc \
-	mixin/alt-server use/vmguest/base use/vmguest/kvm/x11\
+	mixin/alt-server use/vmguest/base \
 	use/bootloader/grub use/rescue/base use/stage2/kms\
 	use/stage2/fs use/stage2/hid use/stage2/md \
 	use/stage2/mmc use/stage2/net use/stage2/net-nfs \
@@ -31,8 +31,10 @@ distro/alt-server: distro/.base distro/.alt-server-vnc \
 	@$(call add,MAIN_LISTS,centaurus/disk-dvd)
 	@$(call add,MAIN_LISTS,centaurus/disk-server-light)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-suspend-stage2)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth)
 	@$(call add,INSTALL2_PACKAGES,strace)
 	@$(call add,INSTALL2_PACKAGES,fdisk)
+	@$(call add,INSTALL2_BRANDING,notes)
 	@$(call add,BASE_KMODULES,kvm virtualbox)
 	@$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power)
 	@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
diff --git a/conf.d/mixin-alt-server.mk b/conf.d/mixin-alt-server.mk
index 28655a05..796ec1d8 100644
--- a/conf.d/mixin-alt-server.mk
+++ b/conf.d/mixin-alt-server.mk
@@ -2,19 +2,20 @@ mixin/alt-server: server_groups = $(addprefix centaurus/,\
 	10-alterator 20-server-apps  50-freeipa 70-dev 90-docs sambaDC buildsystem dhcp-server-a diag-tools dns-server-a ftp-server-a mail-server-a mediawiki owncloud domain-server freeipa-client)
 
 mixin/alt-server: +installer +systemd \
-	use/branding/complete use/control use/services \
+	use/branding/notes use/syslinux/ui/gfxboot \
+	use/plymouth/stage2 use/control use/services \
 	use/l10n/default/ru_RU use/install2/stage3 \
 	use/install2/vnc use/install2/xfs use/install2/fat \
 	use/volumes/cliff-server \
 	use/apt-conf/branch \
 	use/fonts/install2 \
 	use/install2/stage3 \
-	use/kernel/desktop \
 	use/firmware/server \
 	use/net/etcnet
 	@$(call set,INSTALLER,centaurus)
 	@$(call set,BRANDING,alt-server)
-	@$(call set,KFLAVOURS,un-def std-def)
+	@$(call add,THE_BRANDING,bootloader bootsplash)
+	@$(call set,KFLAVOURS,std-def)
 	@$(call add,BASE_LISTS,centaurus/base)
 	@$(call add,BASE_LISTS,centaurus/base-server)
 	@$(call add,LIVE_LISTS,centaurus/live)
diff --git a/pkg.in/lists/centaurus/10-alterator b/pkg.in/lists/centaurus/10-alterator
index b8c95715..e1b0f490 100644
--- a/pkg.in/lists/centaurus/10-alterator
+++ b/pkg.in/lists/centaurus/10-alterator
@@ -57,10 +57,6 @@ branding-alt-server-indexhtml@X86
 alterator-fbi
 ###installer-feature-display-acc-address-stage3
 
-alterator-ca
-alterator-mirror
-alterator-net-domain
-alterator-net-eth
 alterator-net-bond
 alterator-net-bridge
 alterator-net-pppoe
diff --git a/pkg.in/lists/centaurus/mate b/pkg.in/lists/centaurus/mate
index 82b6c4ba..303f54cd 100644
--- a/pkg.in/lists/centaurus/mate
+++ b/pkg.in/lists/centaurus/mate
@@ -4,6 +4,8 @@ pmount
 pam_mount
 cifs-utils
 pam_ccreds
+libsss_nss_idmap
+libwbclient-sssd
 
 udev-alsa
 
@@ -132,3 +134,23 @@ avahi-tools
 setup-mate-terminal@E2K
 setup-mate-nocomposite@E2K
 setup-libgl-dri3-disable@E2K
+avahi-daemon
+avahi-tools
+
+alterator-root
+alterator-users
+alterator-notes
+alterator-grub
+alterator-firsttime
+alterator-logs
+alterator-mirror
+alterator-net-eth
+alterator-net-domain
+alterator-net-pppoe
+alterator-net-pptp
+alterator-net-openvpn
+alterator-updates
+alterator-quota
+
+alterator-net-bond
+alterator-net-bridge
diff --git a/pkg.in/lists/centaurus/xorg b/pkg.in/lists/centaurus/xorg
index 3dfa9395..0c998cba 100644
--- a/pkg.in/lists/centaurus/xorg
+++ b/pkg.in/lists/centaurus/xorg
@@ -42,9 +42,22 @@ x-cursor-theme-jimmac
 menu-icons-default
 
 branding-alt-server-graphics@X86
+branding-alt-server-bootloader@X86
+branding-alt-server-bootsplash@X86
 
-
-ndiswrapper@X86
 firefox-esr
 firefox-esr-ru
 firefox-esr-uk
+
+
+spice-vdagent
+xorg-drv-qxl
+kernel-modules-drm-std-def
+kernel-modules-drm-radeon-std-def
+kernel-modules-drm-nouveau-std-def
+kernel-modules-v4l-std-def
+kernel-modules-lirc-std-def
+
+make-initrd-plymouth
+cpio
+branding-alt-server-bootsplash