From f3a0117ecdfe125975e582df02d9a4c8633128da Mon Sep 17 00:00:00 2001 From: Arata Notsu Date: Tue, 9 Apr 2013 21:43:52 +0900 Subject: [PATCH] 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 --- nova/cmd/baremetal_deploy_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/cmd/baremetal_deploy_helper.py b/nova/cmd/baremetal_deploy_helper.py index 722ad69390..365451b6b6 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])