Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory-plugins
Commits
21d9dbbd
Verified
Commit
21d9dbbd
authored
6 years ago
by
Côme Chilliet
2
Browse files
Options
Download
Patches
Plain Diff
fix(fai) Do not forbid use of partitions from cryptsetup in lvm
issue #5821
parent
40a48a76
dev
6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines
6250-supann-configuration-backend-requires-account-life-cycle-section
6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure
6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id
6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5
6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2
6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases
6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user
6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects
6346-lifecycle-adaptation-to-select-supann-resources-and-related-states-via-regex-mechanism
master
fusiondirectory-1.5
fusiondirectory-1.4
fusiondirectory-1.3.1
fusiondirectory-1.3
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
fai/admin/fai/class_faiDiskEntry.inc
+1
-1
fai/admin/fai/class_faiDiskEntry.inc
with
1 addition
and
1 deletion
+1
-1
fai/admin/fai/class_faiDiskEntry.inc
+
1
−
1
View file @
21d9dbbd
...
...
@@ -532,7 +532,7 @@ class faiDiskEntry extends simplePlugin
foreach
(
$disk
[
'partitions'
]
as
$part
)
{
// Add disks of raid arrays, to the used list.
if
(
in_array
(
$disk
[
'FAIdiskType'
]
,
array
(
'raid'
,
'cryptsetup'
))
)
{
if
(
$disk
[
'FAIdiskType'
]
==
'raid'
)
{
foreach
(
explode
(
','
,
$part
[
'FAIpartitionSize'
])
as
$rDevice
)
{
$used
[]
=
preg_replace
(
'/:.*$/i'
,
''
,
$rDevice
);
}
...
...
This diff is collapsed.
Click to expand it.
Côme Chilliet
@cchilliet
mentioned in commit
85999169
·
6 years ago
mentioned in commit
85999169
mentioned in commit 85999169e31145afea0d9e18b47d0e357de164b3
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets