summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-08-14 21:39:48 -0400
committerScott Moser <smoser@ubuntu.com>2013-08-14 21:39:48 -0400
commitc09cb99dbee54745f06583d9ff0ea4b91e8b087e (patch)
tree8dde44d0ea6a6cdbdffba59af3575fcf4e0a7663 /cloudinit
parentdbb2dc51cd351d05d4fd3b74133074877bd647f8 (diff)
parentcc0b78533dd1f863901119c420f5779a66396d27 (diff)
downloadvyos-cloud-init-c09cb99dbee54745f06583d9ff0ea4b91e8b087e.tar.gz
vyos-cloud-init-c09cb99dbee54745f06583d9ff0ea4b91e8b087e.zip
cc_growpart: prefer growpart over parted 'resizepart'
the resizepart code was not functional. We will re-favor it later under bug 1212492. For now, we'll just favor the 'growpart' resizer. Both will be found in Ubuntu cloud images. LP: #1212444
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/config/cc_growpart.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/cloudinit/config/cc_growpart.py b/cloudinit/config/cc_growpart.py
index ba6c58af..2d54aabf 100644
--- a/cloudinit/config/cc_growpart.py
+++ b/cloudinit/config/cc_growpart.py
@@ -96,7 +96,7 @@ class ResizeParted(object):
def resize(self, diskdev, partnum, partdev):
before = get_size(partdev)
try:
- util.subp(["parted", "resizepart", diskdev, partnum])
+ util.subp(["parted", diskdev, "resizepart", partnum])
except util.ProcessExecutionError as e:
raise ResizeFailedException(e)
@@ -272,4 +272,6 @@ def handle(_name, cfg, _cloud, log, _args):
else:
log.debug("'%s' %s: %s" % (entry, action, msg))
-RESIZERS = (('parted', ResizeParted), ('growpart', ResizeGrowPart))
+# LP: 1212444 FIXME re-order and favor ResizeParted
+#RESIZERS = (('growpart', ResizeGrowPart),)
+RESIZERS = (('growpart', ResizeGrowPart), ('parted', ResizeParted))