From 604f560b00b1e2667fd4e6acea85621b60795a62 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Fri, 15 Sep 2017 11:45:29 -0400
Subject: [PATCH] Add in upstream patch to fix call to xfs_growfs

https://bugzilla.redhat.com/show_bug.cgi?id=1490505
---
 ...izefs-pass-mount-point-to-xfs_growfs.patch | 36 +++++++++++++++++++
 cloud-init.spec                               | 10 +++++-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 cloud-init-0.7.9-resizefs-pass-mount-point-to-xfs_growfs.patch

diff --git a/cloud-init-0.7.9-resizefs-pass-mount-point-to-xfs_growfs.patch b/cloud-init-0.7.9-resizefs-pass-mount-point-to-xfs_growfs.patch
new file mode 100644
index 0000000..c4439ab
--- /dev/null
+++ b/cloud-init-0.7.9-resizefs-pass-mount-point-to-xfs_growfs.patch
@@ -0,0 +1,36 @@
+From 29a9296cd68516e76d0bd8da320754a222c4ee45 Mon Sep 17 00:00:00 2001
+From: Dusty Mabe <dusty@dustymabe.com>
+Date: Wed, 13 Sep 2017 11:08:56 -0400
+Subject: [PATCH 1/2] resizefs: pass mount point to xfs_growfs
+
+Supposedly it was never a feature to be able to pass a path to a block
+device to xfs_growfs and have it grow the filesystem. The behavior changed
+upstream recently. It is only supported to pass the mount point of a mounted
+XFS filesystem. This causes breakages in cloud-init.
+
+Upstream xfs change was commit b97815a0321072a7154ecab63e297af84066fc78.
+ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=b97815a0321
+
+rhbz: rhbz: https://bugzilla.redhat.com/show_bug.cgi?id=1490505
+
+Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
+---
+ cloudinit/config/cc_resizefs.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cloudinit/config/cc_resizefs.py b/cloudinit/config/cc_resizefs.py
+index f14d383..f42b6a6 100644
+--- a/cloudinit/config/cc_resizefs.py
++++ b/cloudinit/config/cc_resizefs.py
+@@ -67,7 +67,7 @@ def _resize_ext(mount_point, devpth):
+ 
+ 
+ def _resize_xfs(mount_point, devpth):
+-    return ('xfs_growfs', devpth)
++    return ('xfs_growfs', mount_point)
+ 
+ 
+ def _resize_ufs(mount_point, devpth):
+-- 
+2.9.4
+
diff --git a/cloud-init.spec b/cloud-init.spec
index 708d743..28b5a31 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -1,6 +1,6 @@
 Name:           cloud-init
 Version:        0.7.9
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Cloud instance init scripts
 License:        GPLv3
 URL:            http://launchpad.net/cloud-init
@@ -110,6 +110,11 @@ Patch23:        cloud-init-0.7.9-nm-resolvconf.patch
 # https://git.launchpad.net/cloud-init/commit/?id=951863c211ab0f8c43a9443d080dbbe0f6b454a6
 Patch24:        cloud-init-0.7.9-fs-setup-cmd.patch
 
+# resizefs: pass mount point to xfs_growfs
+# https://bugzilla.redhat.com/show_bug.cgi?id=1490505
+# https://code.launchpad.net/~dustymabe/cloud-init/+git/cloud-init/+merge/330701
+Patch25: cloud-init-0.7.9-resizefs-pass-mount-point-to-xfs_growfs.patch
+
 BuildArch:      noarch
 
 BuildRequires:  pkgconfig(systemd)
@@ -242,6 +247,9 @@ nosetests-%{python3_version} tests/unittests/
 
 
 %changelog
+* Fri Sep 15 2017 Dusty Mabe <dusty@dustymabe.com> - 0.7.9-9
+- Fix issues with growing xfs filesystems [RH:1490505]
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.9-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild