Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Anton Palgunov
mkimage-profiles
Commits
203243ee
Commit
203243ee
authored
Jun 24, 2019
by
Anton V. Boyarshinov
Committed by
Michael Shigorin
May 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no pve, no more conflict between samba & sambaDC
parent
7902508d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
alt-server.mk
conf.d/alt-server.mk
+4
-4
samba.directory
pkg.in/groups/centaurus/samba.directory
+0
-1
sambaDC.directory
pkg.in/groups/centaurus/sambaDC.directory
+0
-1
No files found.
conf.d/alt-server.mk
View file @
203243ee
...
@@ -6,10 +6,10 @@ distro/alt-server: server_groups_x86 = $(addprefix centaurus/,\
...
@@ -6,10 +6,10 @@ distro/alt-server: server_groups_x86 = $(addprefix centaurus/,\
blogs emulators gnome-peer-to-peer freeipa-server freenx-server \
blogs emulators gnome-peer-to-peer freeipa-server freenx-server \
ipmi v12n-server netinst sogo virt-manager)
ipmi v12n-server netinst sogo virt-manager)
ifeq (,$(filter-out x86_64,$(ARCH)))
#
ifeq (,$(filter-out x86_64,$(ARCH)))
distro/alt-server: server_groups_x86_64 = $(addprefix centaurus/,\
#
distro/alt-server: server_groups_x86_64 = $(addprefix centaurus/,\
40-pve
)
#
)
endif
#
endif
# FIXME: generalize vm-profile
# FIXME: generalize vm-profile
distro/alt-server: distro/.base mixin/alt-server +efi +vmguest \
distro/alt-server: distro/.base mixin/alt-server +efi +vmguest \
...
...
pkg.in/groups/centaurus/samba.directory
View file @
203243ee
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
Encoding=UTF-8
Encoding=UTF-8
Type=Directory
Type=Directory
Name=Samba Server
Name=Samba Server
X-Alterator-Conflicts=centaurus/sambaDC
X-Alterator-PackageList=centaurus/samba
X-Alterator-PackageList=centaurus/samba
X-Alterator-Required=no
X-Alterator-Required=no
X-Alterator-Parent=centaurus/20-server-apps
X-Alterator-Parent=centaurus/20-server-apps
...
...
pkg.in/groups/centaurus/sambaDC.directory
View file @
203243ee
...
@@ -3,7 +3,6 @@ Encoding=UTF-8
...
@@ -3,7 +3,6 @@ Encoding=UTF-8
Type=Directory
Type=Directory
Name=SambaDC Server (AD controller)
Name=SambaDC Server (AD controller)
X-Alterator-PackageList=centaurus/sambaDC
X-Alterator-PackageList=centaurus/sambaDC
X-Alterator-Conflicts=centaurus/samba-server centaurus/domain-server
X-Alterator-Required=no
X-Alterator-Required=no
X-Alterator-Parent=centaurus/20-server-apps
X-Alterator-Parent=centaurus/20-server-apps
Name[ru_RU]=Сервер SambaDC (контроллер AD)
Name[ru_RU]=Сервер SambaDC (контроллер AD)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment