Merge lp:~harmw/cloud-init/growfs-gpart-fixes_for_fbsd into lp:~cloud-init-dev/cloud-init/trunk

[Harm Weites]

Required (minor) change for resizing a disk on freebsd. The challenging work will be done upstream (freebsd ports) and will also require a slight version bump to get this changeset in.

[Joshua Harlow (harlowja)]

Seems ok to me...

[Bert JW Regeer (bregeer-ctl)]

I'd like to see this merged...

review: Approve

[Scott Moser (smoser)]

Hello,
Thank you for taking the time to contribute to cloud-init. Cloud-init has moved its revision control system to git. As a result, we are marking all bzr merge proposals as 'rejected'. If you would like to re-submit this proposal for review, please do so by following the current HACKING documentation at http://cloudinit.readthedocs.io/en/latest/topics/hacking.html .

If this is still relevant, please do re-submit.

Scott

[Scott Moser (smoser)]

I pushed these changes for review at
 https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/344024

Unmerged revisions

1050. By Harm Weites on 2015-01-11

fix: How did gpart from ports end up in the requirements list given there
is a gpart available from BASE...?
The real fix for this will need to be done upstream where a change to the
port is required to reflect this dependency change.

1049. By Harm Weites on 2015-01-11

fix: Make sure growfs doesn't (interactively) ask for confirmation.

=== modified file 'cloudinit/config/cc_resizefs.py'
--- cloudinit/config/cc_resizefs.py	2014-09-16 00:13:07 +0000
+++ cloudinit/config/cc_resizefs.py	2015-01-11 20:48:14 +0000
@@ -41,7 +41,7 @@
 
 
 def _resize_ufs(mount_point, devpth):
-    return ('growfs', devpth)
+    return ('growfs','-y', devpth)
 
 # Do not use a dictionary as these commands should be able to be used
 # for multiple filesystem types if possible, e.g. one command for

=== modified file 'tools/build-on-freebsd'
--- tools/build-on-freebsd	2014-09-29 13:04:35 +0000
+++ tools/build-on-freebsd	2015-01-11 20:48:14 +0000
@@ -10,7 +10,6 @@
 pkgs="
    dmidecode
    e2fsprogs
-   gpart
    py27-Jinja2
    py27-argparse
    py27-boto