Add patch to fix unmounting btrfs subvolumes

0001-fix-subvolume-umount-path.patch

@@ -0,0 +1,25 @@
+From 8ec9b36ea829630b66a10ecbe4fe736648a65860 Mon Sep 17 00:00:00 2001
+From: Davide Cavalca <davide@cavalca.name>
+Date: Sat, 11 Jul 2020 15:24:39 -0700
+Subject: [PATCH] fix subvolume umount path
+
+---
+ appcreate/partitionedfs.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/appcreate/partitionedfs.py b/appcreate/partitionedfs.py
+index 86e709c..a1597ea 100644
+--- a/appcreate/partitionedfs.py
++++ b/appcreate/partitionedfs.py
+@@ -256,7 +256,7 @@ class PartitionedMount(Mount):
+             ordered += others
+              
+             for s in ordered:
+-                subprocess.call(['umount', s['mountpoint']])
++                subprocess.call(['umount', "%s%s" % (self.mountdir, s['mountpoint'])])
+     
+         for mp in self.unmountOrder:
+             if mp == 'swap':
+-- 
+2.26.2
+

appliance-tools.spec

@@ -21,12 +21,15 @@
 Name: appliance-tools
 Summary: Tools for building Appliances
 Version: 010.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 URL: https://pagure.io/appliance-tools
 
 Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
 
+# Backports from upstream
+Patch0001: 0001-fix-subvolume-umount-path.patch
+
 # Ensure system deps are installed (rhbz#1409536)
 Requires: python%{python_pkgversion}-imgcreate %{?min_imgcrate_evr:>= %{min_imgcreate_evr}}
 Requires: python%{python_pkgversion}-progress
@@ -73,6 +76,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %{python_sitelib}/ec2convert/
 
 %changelog
+* Sat Jul 11 2020 Neal Gompa <ngompa13@gmail.com> - 010.0-2
+- Add patch to fix unmounting btrfs subvolumes
+
 * Fri Jul 10 2020 Neal Gompa <ngompa13@gmail.com> - 010.0-1
 - Update to 010.0 release
 - Drop merged patches