diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-09 15:27:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-09 15:27:48 +0000 |
| commit | 4312c795cfcbc05a9bf99d3fbdddd9b3eca30e35 (patch) | |
| tree | 1a3525669d3f2824674a259dfff8c690d65bbc6b /nova/utils.py | |
| parent | 528add2df39c2381cc7992a5026d283eea8816fa (diff) | |
| parent | 3001c7918f503a04e85bfb429321d13129ddd180 (diff) | |
| download | nova-4312c795cfcbc05a9bf99d3fbdddd9b3eca30e35.tar.gz nova-4312c795cfcbc05a9bf99d3fbdddd9b3eca30e35.tar.xz nova-4312c795cfcbc05a9bf99d3fbdddd9b3eca30e35.zip | |
Merge "Make utils.mkfs() set label when fs=swap"
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/nova/utils.py b/nova/utils.py index 398c620f8..d9ded16b6 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -1160,17 +1160,17 @@ def mkfs(fs, path, label=None): :param label: Volume label to use """ if fs == 'swap': - execute('mkswap', path) + args = ['mkswap'] else: args = ['mkfs', '-t', fs] - #add -F to force no interactive excute on non-block device. - if fs in ('ext3', 'ext4'): - args.extend(['-F']) - if label: - if fs in ('msdos', 'vfat'): - label_opt = '-n' - else: - label_opt = '-L' - args.extend([label_opt, label]) - args.append(path) - execute(*args) + #add -F to force no interactive execute on non-block device. + if fs in ('ext3', 'ext4'): + args.extend(['-F']) + if label: + if fs in ('msdos', 'vfat'): + label_opt = '-n' + else: + label_opt = '-L' + args.extend([label_opt, label]) + args.append(path) + execute(*args) |