valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11168 from dmyerscough/develop

Browse Source 
mkpart should only create partitions and mkpartfs should support xfs
This commit is contained in:
Joseph Hall 2014-03-13 06:42:58 -06:00
commit 95855a0abf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/parted.py
View File

@ -444,7 +444,7 @@ def mkpart(device, part_type, fs_type, start, end):
)
if fs_type not in set(['ext2', 'fat32', 'fat16', 'linux-swap', 'reiserfs',
'hfs', 'hfs+', 'hfsx', 'NTFS', 'ufs']):
'hfs', 'hfs+', 'hfsx', 'NTFS', 'ufs', 'xfs']):
raise CommandExecutionError(
'Invalid fs_type passed to partition.mkpart'
)
@ -487,7 +487,7 @@ def mkpartfs(device, part_type, fs_type, start, end):
)
if fs_type not in set(['ext2', 'fat32', 'fat16', 'linux-swap', 'reiserfs',
'hfs', 'hfs+', 'hfsx', 'NTFS', 'ufs']):
'hfs', 'hfs+', 'hfsx', 'NTFS', 'ufs', 'xfs']):
raise CommandExecutionError(
'Invalid fs_type passed to partition.mkpartfs'
)