Skip to content
GitLab
Commit 7e9fa3a8 authored by jswaelens's avatar jswaelens
Browse files

Merge branch '5846-add-vfat-as-iflesystem-for-fai-partition' into '1.3-dev' 

Resolve "Add vfat as filesystem for FAI partition"

Closes #5846

See merge request fusiondirectory/fd-plugins!283
parents df43601e 5fdfb2b5
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 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
+2 -2
fai/admin/fai/class_faiPartition.inc
+ 2
− 2
View file @ 7e9fa3a8
...@@ -318,8 +318,8 @@ class faiPartition extends simplePlugin ...@@ -318,8 +318,8 @@ class faiPartition extends simplePlugin
new SelectAttribute ( new SelectAttribute (
_('Filesystem'), _('The filesystem this partition should be formatted with'), _('Filesystem'), _('The filesystem this partition should be formatted with'),
'FAIfsType', TRUE, 'FAIfsType', TRUE,
array('swap','ext2','ext3','ext4','reiserfs','xfs','btrfs','-'), 'ext4', array('swap','vfat','ext2','ext3','ext4','reiserfs','xfs','btrfs','-'), 'ext4',
array(_('swap'),_('ext2'),_('ext3'),_('ext4'),_('reiser fs'),_('xfs'),_('btrfs'),_('LVM/RAID')) array(_('swap'),_('fat32'),_('ext2'),_('ext3'),_('ext4'),_('reiser fs'),_('xfs'),_('btrfs'),_('LVM/RAID'))
), ),
new FaiMountPointAttribute ( new FaiMountPointAttribute (
_('Mount point'), _('Mount point for this partition'), _('Mount point'), _('Mount point for this partition'),
......
  • Ghost User @ghost ·

    SonarQube analysis indicates that quality gate is failed.

    • Security Rating on New Code is passed: Actual value 1
    • Reliability Rating on New Code is passed: Actual value 1
    • Maintainability Rating on New Code is passed: Actual value 1
    • Duplicated Lines on New Code (%) is failed: Actual value 10.21671826625387 > 5

    SonarQube analysis reported no issues.

  • Jonathan Swaelens @jswaelens

    mentioned in commit 3f3a3223

     ·

    mentioned in commit 3f3a3223

    Toggle commit list
  • bmortier @bmortier

    mentioned in commit 78498832

     ·

    mentioned in commit 78498832

    Toggle commit list
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment