Merge ~jibel/ubiquity:lp187504-dont_export_all_pools into ubiquity:master

[Jean-Baptiste Lallement]

Only export pools with dataset mounted under /target instead of exporting everything with -a.

[Didier Roche-Tolomelli (didrocks)]

LGTM +1 Trusting your tests :)

review: Approve

[Jean-Baptiste Lallement (jibel)]

Tested with a zfs installation and entire disk/ext4.

diff --git a/bin/ubiquity b/bin/ubiquity
index 9e50e7e..309fdd9 100755
--- a/bin/ubiquity
+++ b/bin/ubiquity
@@ -382,19 +382,21 @@ def unmount_target():
     if not TARGET:
         return
     paths = []
+    pools = set()
     with open('/proc/mounts') as mounts:
         for line in mounts:
-            path = line.split(' ')[1]
+            source, path, fstype = line.split(' ')[:3]
             if path == TARGET or path.startswith(TARGET + '/'):
                 paths.append(path)
+                if fstype == 'zfs':
+                    pools.add(source.split('/')[0])
     paths.sort()
     paths.reverse()
     for path in paths:
         misc.execute_root('fuser', '-cv', path)
         misc.execute_root('umount', path)
-    if os.path.exists("/sbin/zpool"):
-        misc.execute_root('umount', '/target/boot/grub')
-        misc.execute_root('/sbin/zpool', 'export', '-a')
+    for pool in pools:
+        misc.execute_root('/sbin/zpool', 'export', pool)
 
 
 def prepend_path(directory):
diff --git a/debian/changelog b/debian/changelog
index f119ca4..ee46088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ubiquity (20.10.2) UNRELEASED; urgency=medium
 
   * zsys-setup: Use persistent device name for vdevs (LP: #1880869)
+  * Only export pools created during installation and containing dataset
+    mounted under /target (LP: #1875045)
 
  -- Jean-Baptiste Lallement <[e-mail]>  Wed, 27 May 2020 13:49:15 +0200