From 7d0a863151ba4aa8a59c05c7a0e1f0ba0f1f3330 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Thu, 28 Apr 2016 15:54:41 +0300 Subject: [PATCH] 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*. --- conf.d/regular.mk | 5 +++-- features.in/server/config.mk | 1 + pkg.in/groups/pgsql-1C-server.directory | 2 +- pkg.in/lists/pgsql-server | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index d1b8b14c..12b26915 100644 --- 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 \ diff --git a/features.in/server/config.mk b/features.in/server/config.mk index 48dc7caf..2e47c566 100644 --- 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; @: diff --git a/pkg.in/groups/pgsql-1C-server.directory b/pkg.in/groups/pgsql-1C-server.directory index b58771d9..ea58ee1f 100644 --- 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; - diff --git a/pkg.in/lists/pgsql-server b/pkg.in/lists/pgsql-server index dcb38603..11739a2e 100644 --- a/pkg.in/lists/pgsql-server +++ b/pkg.in/lists/pgsql-server @@ -1 +1,2 @@ postgresql9.5-server +postgresql9.5-contrib