OpenStack Compute (nova)

Merge lp:~soren/nova/execvp-fallout into lp:~hudson-openstack/nova/trunk

  1. execvp-fallout
  2. Merge into trunk
Proposed by Soren Hansen
Status: Merged
Approved by: Jay Pipes
Approved revision: 789
Merged at revision: 784
Proposed branch: lp:~soren/nova/execvp-fallout
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 10 lines (+1/-1)
1 file modified
nova/virt/disk.py (+1/-1)
To merge this branch: bzr merge lp:~soren/nova/execvp-fallout
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Review via email: mp+52870@code.launchpad.net

Description of the change

Another little bit of fallout from the execvp branch.

To post a comment you must log in.
Revision history for this message
Jay Pipes (jaypipes) wrote :

ninja.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/virt/disk.py'
2--- nova/virt/disk.py 2011-03-09 19:31:23 +0000
3+++ nova/virt/disk.py 2011-03-10 15:32:33 +0000
4@@ -51,7 +51,7 @@
5 return
6 utils.execute('truncate', '-s', size, image)
7 # NOTE(vish): attempts to resize filesystem
8- utils.execute('e2fsck', '-fp', mage, check_exit_code=False)
9+ utils.execute('e2fsck', '-fp', image, check_exit_code=False)
10 utils.execute('resize2fs', image, check_exit_code=False)
11
12