x/gantt
Code Issues Proposed changes

Merging two mkfs commands.

Browse Source 
nova.disk.api.mkfs will use nova.utils.mkfs,
unless an arbitrary mkfs command has been provided by the user.
Preserving the default filesystem to be used for each os_type.

Also, adding run_as_root parameter to utils.mkfs, to allow it
handle block devices.

Change-Id: I3ca21e0ee80caa7e1152ebae56d73ed3c14844c0
This commit is contained in:
Vladik Romanovsky
2013-09-26 16:21:22 -04:00
parent 10b6df27da
commit ebb53d6243
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/utils.py
View File

@@ -850,7 +850,7 @@ class UndoManager(object):
self._rollback() self._rollback()
def mkfs(fs, path, label=None): def mkfs(fs, path, label=None, run_as_root=False):
"""Format a file or block device """Format a file or block device
:param fs: Filesystem type (examples include 'swap', 'ext3', 'ext4' :param fs: Filesystem type (examples include 'swap', 'ext3', 'ext4'
@@ -863,7 +863,7 @@ def mkfs(fs, path, label=None):
else: else:
args = ['mkfs', '-t', fs] args = ['mkfs', '-t', fs]
#add -F to force no interactive execute on non-block device. #add -F to force no interactive execute on non-block device.
if fs in ('ext3', 'ext4'): if fs in ('ext3', 'ext4', 'ntfs'):
args.extend(['-F']) args.extend(['-F'])
if label: if label:
if fs in ('msdos', 'vfat'): if fs in ('msdos', 'vfat'):
@@ -872,7 +872,7 @@ def mkfs(fs, path, label=None):
label_opt = '-L' label_opt = '-L'
args.extend([label_opt, label]) args.extend([label_opt, label])
args.append(path) args.append(path)
execute(*args) execute(*args, run_as_root=run_as_root)
def last_bytes(file_like_object, num): def last_bytes(file_like_object, num):