diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-14 21:23:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-14 21:23:57 +0000 |
| commit | 3ede145bfe505ea1d9d60c70d23f0426fb02559c (patch) | |
| tree | eabf122a0aae2f60524944504096a5d9f4e4e0c1 | |
| parent | c9ca372b0b9fe887dd3ac6bdb02514b5495a1917 (diff) | |
| parent | 4b1bc840d372f4cdc16510016c7b6318a65a7282 (diff) | |
| download | nova-3ede145bfe505ea1d9d60c70d23f0426fb02559c.tar.gz nova-3ede145bfe505ea1d9d60c70d23f0426fb02559c.tar.xz nova-3ede145bfe505ea1d9d60c70d23f0426fb02559c.zip | |
Merge "e2fsck needs -y"
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index c529a0e1d..1c3470095 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -1599,7 +1599,7 @@ def _resize_part_and_fs(dev, start, old_sectors, new_sectors): partition_path = utils.make_dev_path(dev, partition=1) # Replay journal if FS wasn't cleanly unmounted - utils.execute('e2fsck', '-f', partition_path, run_as_root=True) + utils.execute('e2fsck', '-f', '-y', partition_path, run_as_root=True) # Remove ext3 journal (making it ext2) utils.execute('tune2fs', '-O ^has_journal', partition_path, |