diff options
| author | Arata Notsu <notsu@virtualtech.jp> | 2013-04-09 21:43:52 +0900 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-13 11:17:54 +0000 |
| commit | 773de421cfc148352a2e133c849bfe1ab311cda7 (patch) | |
| tree | c6d6872a2f107a4bd510ed87feb60a87ff0e05e2 /nova/cmd | |
| parent | 4d5267bffcbdb0461b245d59f090a12ea6325e27 (diff) | |
| download | nova-773de421cfc148352a2e133c849bfe1ab311cda7.tar.gz nova-773de421cfc148352a2e133c849bfe1ab311cda7.tar.xz nova-773de421cfc148352a2e133c849bfe1ab311cda7.zip | |
baremetal: Change input for sfdisk
To prevent sfdisk stopping with "bad input", use a empty string
instead of "-" (and doing so requires using "," as a separator).
Fixes bug 1166112
Change-Id: I5e4cffaa326fbafd1583d55744f921a40b3ae76f
Diffstat (limited to 'nova/cmd')
| -rw-r--r-- | nova/cmd/baremetal_deploy_helper.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/cmd/baremetal_deploy_helper.py b/nova/cmd/baremetal_deploy_helper.py index 722ad6939..365451b6b 100644 --- a/nova/cmd/baremetal_deploy_helper.py +++ b/nova/cmd/baremetal_deploy_helper.py @@ -87,7 +87,7 @@ def make_partitions(dev, root_mb, swap_mb): # we lose the space. # http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/raring/util-linux/ # raring/view/head:/fdisk/sfdisk.c#L1940 - stdin_command = ('1 %d 83;\n- %d 82;\n0 0;\n0 0;\n' % (root_mb, swap_mb)) + stdin_command = ('1,%d,83;\n,%d,82;\n0,0;\n0,0;\n' % (root_mb, swap_mb)) utils.execute('sfdisk', '-uM', dev, process_input=stdin_command, run_as_root=True, check_exit_code=[0]) |