Attachment 1013352 Details for Bug 1210428 – cloud-init patch to use sfdisk >= 2.26 for resizing if available

[patch] cloud-init patch to use sfdisk >= 2.26 for resizing if available

cloud.patch (text/plain), 1.59 KB, created by Adam Williamson on 2015-04-11 07:07:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Williamson

Created: 2015-04-11 07:07:04 UTC

Size: 1.59 KB

patch

obsolete

>--- cloud-init/cloudinit/config/cc_growpart.py	2015-04-10 22:04:56.469131000 -0700
>+++ cloud-init/cloudinit/config/cc_growpart.py.new	2015-04-10 23:56:14.515947463 -0700
>@@ -23,6 +23,8 @@
> import re
> import stat
> 
>+from distutils.version import LooseVersion
>+
> from cloudinit import log as logging
> from cloudinit.settings import PER_ALWAYS
> from cloudinit import util
>@@ -80,6 +82,33 @@
>     pass
> 
> 
>+class ResizeSfdisk(object):
>+    def available(self):
>+        myenv = os.environ.copy()
>+        myenv['LANG'] = 'C'
>+
>+        try:
>+            # this doesn't work for GPT disks with sfdisk < 2.26
>+            (out, _err) = util.subp(["sfdisk", "--version"], env=myenv)
>+            ver = out.split()[-1].strip()
>+            if LooseVersion(ver) >= '2.26':
>+                return True
>+
>+        except util.ProcessExecutionError:
>+            pass
>+        return False
>+
>+    def resize(self, diskdev, partnum, partdev):
>+        before = get_size(partdev)
>+        try:
>+            util.subp(["echo", "',+'", "|", "sfdisk", "-N", partnum, diskdev])
>+        except util.ProcessExecutionError as e:
>+            util.logexc(LOG, "Failed: growpart %s %s", diskdev, partnum)
>+            raise ResizeFailedException(e)
>+
>+        return (before, get_size(partdev))
>+
>+
> class ResizeGrowPart(object):
>     def available(self):
>         myenv = os.environ.copy()
>@@ -297,4 +326,4 @@
>         else:
>             log.debug("'%s' %s: %s" % (entry, action, msg))
> 
>-RESIZERS = (('growpart', ResizeGrowPart), ('gpart', ResizeGpart))
>+RESIZERS = (('sfdisk', ResizeSfdisk), ('growpart', ResizeGrowPart), ('gpart', ResizeGpart))

Actions: View | Diff

Attachments on bug 1210428: 1013214 | 1013352