keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no pve, no more conflict between samba & sambaDC

Browse Source
This commit is contained in:
Anton V. Boyarshinov 2019-06-24 16:40:51 +03:00 committed by Michael Shigorin
parent 7902508de2
commit 203243eed9
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf.d/alt-server.mk
View File

@ -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 \

1
pkg.in/groups/centaurus/samba.directory
View File

@ -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

1
pkg.in/groups/centaurus/sambaDC.directory
View File

@ -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)