From 203243eed9d0035bca09def3d815adf56fcefb7c Mon Sep 17 00:00:00 2001 From: "Anton V. Boyarshinov" Date: Mon, 24 Jun 2019 16:40:51 +0300 Subject: [PATCH] no pve, no more conflict between samba & sambaDC --- conf.d/alt-server.mk | 8 ++++---- pkg.in/groups/centaurus/samba.directory | 1 - pkg.in/groups/centaurus/sambaDC.directory | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/conf.d/alt-server.mk b/conf.d/alt-server.mk index 4a6827aa..13e495c1 100644 --- a/conf.d/alt-server.mk +++ b/conf.d/alt-server.mk @@ -6,10 +6,10 @@ distro/alt-server: server_groups_x86 = $(addprefix centaurus/,\ blogs emulators gnome-peer-to-peer freeipa-server freenx-server \ ipmi v12n-server netinst sogo virt-manager) -ifeq (,$(filter-out x86_64,$(ARCH))) -distro/alt-server: server_groups_x86_64 = $(addprefix centaurus/,\ - 40-pve ) -endif +#ifeq (,$(filter-out x86_64,$(ARCH))) +#distro/alt-server: server_groups_x86_64 = $(addprefix centaurus/,\ +# ) +#endif # FIXME: generalize vm-profile distro/alt-server: distro/.base mixin/alt-server +efi +vmguest \ diff --git a/pkg.in/groups/centaurus/samba.directory b/pkg.in/groups/centaurus/samba.directory index 0d3b9250..2444d7bc 100644 --- a/pkg.in/groups/centaurus/samba.directory +++ b/pkg.in/groups/centaurus/samba.directory @@ -2,7 +2,6 @@ Encoding=UTF-8 Type=Directory Name=Samba Server -X-Alterator-Conflicts=centaurus/sambaDC X-Alterator-PackageList=centaurus/samba X-Alterator-Required=no X-Alterator-Parent=centaurus/20-server-apps diff --git a/pkg.in/groups/centaurus/sambaDC.directory b/pkg.in/groups/centaurus/sambaDC.directory index f7024aba..ff5680f5 100644 --- a/pkg.in/groups/centaurus/sambaDC.directory +++ b/pkg.in/groups/centaurus/sambaDC.directory @@ -3,7 +3,6 @@ Encoding=UTF-8 Type=Directory Name=SambaDC Server (AD controller) X-Alterator-PackageList=centaurus/sambaDC -X-Alterator-Conflicts=centaurus/samba-server centaurus/domain-server X-Alterator-Required=no X-Alterator-Parent=centaurus/20-server-apps Name[ru_RU]=Сервер SambaDC (контроллер AD)