fixed regular-server.iso

There were two problems: - the latest pgsql related groups made installation impossible (yes, that last minute change); - hardware testing shows that use/stage2/kms is now requisite as xorg-drv-fbdev might just refuse to work with what looks like a perfectly good framebuffer... Do away with them *quick*.

fixed regular-server.iso
7d0a8631 · Michael Shigorin · d7567f3e · 7d0a8631 · 7d0a8631 · 7d0a8631
Commit 7d0a8631 authored Apr 28, 2016 by Michael Shigorin
Showing with 6 additions and 3 deletions

regular.mk conf.d/regular.mk +3 -2

config.mk features.in/server/config.mk +1 -0

pgsql-1C-server.directory pkg.in/groups/pgsql-1C-server.directory +1 -1

pgsql-server pkg.in/lists/pgsql-server +1 -0

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -232,7 +232,8 @@ distro/regular-sysv-tde: distro/.regular-install-x11 \
 	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)

 distro/.regular-server: distro/.regular-install \
-	use/server/mini use/firmware/qlogic use/rescue/base use/cleanup/x11
+	use/server/mini use/firmware/qlogic use/rescue/base \
+	use/cleanup/x11 use/stage2/kms
 	@$(call add,THE_LISTS,$(call tags,regular server))
 	@$(call add,MAIN_PACKAGES,aptitude)
 	@$(call set,INSTALLER,altlinux-server)
@@ -246,7 +247,7 @@ distro/.regular-server-managed: distro/.regular-server
 	@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)

 distro/regular-server: distro/.regular-server-managed use/server/groups/base
-	@$(call add,MAIN_GROUPS,sambaDC-server pgsql-server pgsql-1C-server)
+	@$(call add,MAIN_GROUPS,sambaDC-server)
 	@$(call add,MAIN_GROUPS,hyperv-tools)

 distro/regular-server-ovz: distro/.regular-server \

--- a/features.in/server/config.mk
+++ b/features.in/server/config.mk
@@ -38,5 +38,6 @@ use/server/groups/tools: use/server
 use/server/groups/services: use/server
 	@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
 	@$(call add,MAIN_GROUPS,dhcp-server mail-server mysql-server)
+	@$(call add,MAIN_GROUPS,pgsql-server)

 use/server/groups/base: use/server/groups/tools use/server/groups/services; @:
--- a/pkg.in/groups/pgsql-1C-server.directory
+++ b/pkg.in/groups/pgsql-1C-server.directory
@@ -5,5 +5,5 @@ Name=PostgreSQL Server (for 1C)
 Name[ru_RU]=Сервер PostgreSQL (вариант для 1С)
 X-Alterator-PackageList=pgsql-1C-server
 X-Alterator-Required=no
+X-Alterator-Conflicts=pgsql-server
 Categories=Server;Networking;
-
--- a/pkg.in/lists/pgsql-server
+++ b/pkg.in/lists/pgsql-server
 postgresql9.5-server
+postgresql9.5-contrib