x/gantt
Code Issues Proposed changes

Merge "Merging two mkfs commands."

Browse Source
This commit is contained in:
Jenkins
2013-10-23 07:42:13 +00:00
committed by Gerrit Code Review
parent bb10bbe341 ebb53d6243
commit 17b37d0881
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

@@ -841,7 +841,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'
@@ -854,7 +854,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'):
@@ -863,7 +863,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):