Merge ~lucaskanashiro/ubuntu/+source/docker.io:fix-postinst-zfs into ubuntu/+source/docker.io:ubuntu/devel

[Lucas Kanashiro]

Fix LP #1910133. Check if the zfs executable is available before calling it in postinst script.

PPA:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/containerd-upgrade-issue/+packages

autopkgtest:

autopkgtest [18:22:48]: @@@@@@@@@@@@@@@@@@@@ summary
basic-smoke PASS
docker-in-lxd PASS

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Lucas. I gave one suggestion to avoid re-indenting everything one more level, so I'm marking this as Needs Fixing. Feel free to adopt it if you like it, or keep things as is :-). In any case, this LGTM and can be uploaded right away.

review: Needs Fixing

[Lucas Kanashiro (lucaskanashiro)]

Thanks Sergio, I applied the modification you suggested. Could you please quickly re-check it before I upload it?

I also uploaded the updated version to the PPA I pointed in the MP description.

[Sergio Durigan Junior (sergiodj)]

Thanks, LGTM!

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thanks! Uploaded:

$ git push pkg upload/19.03.13-0ubuntu6
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 32 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.48 KiB | 757.00 KiB/s, done.
Total 9 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/docker.io
 * [new tag] upload/19.03.13-0ubuntu6 -> upload/19.03.13-0ubuntu6
$ dput ubuntu ../docker.io_19.03.13-0ubuntu6_source.changes
Checking signature on .changes
gpg: ../docker.io_19.03.13-0ubuntu6_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../docker.io_19.03.13-0ubuntu6.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading docker.io_19.03.13-0ubuntu6.dsc: done.
  Uploading docker.io_19.03.13-0ubuntu6.debian.tar.xz: done.
  Uploading docker.io_19.03.13-0ubuntu6_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 0f1a2c3..d537937 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+docker.io (19.03.13-0ubuntu6) hirsute; urgency=medium
+
+  * d/docker.io.postinst: check if zfs exists before calling it (LP: #1910133).
+    The zfs executable is provided by zfs-fuse | zfsutils and they are
+    runtime Suggested dependencies, which means they might not be available
+    during configuration time.
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 04 Jan 2021 17:25:39 -0300
+
 docker.io (19.03.13-0ubuntu5) hirsute; urgency=medium
 
   * d/rules: pass -r instead of --no-stop-on-upgrade to dh_systemd_start.
diff --git a/debian/docker.io.postinst b/debian/docker.io.postinst
index 2aa6f77..68149f5 100644
--- a/debian/docker.io.postinst
+++ b/debian/docker.io.postinst
@@ -23,7 +23,11 @@ case "$1" in
 
 		# ZFS handling: create a dedicated ZFS docker dataset to handle all children containers in a single,
 		# persistent, place.
-		if modinfo zfs >/dev/null 2>&1; then
+		# Also check if zfs executable exists and if it is in $PATH.
+		# The zfs command is provided by zfs-fuse | zfsutils and they
+		# are runtime Suggested dependencies which means they are not
+		# necessarily available during configuration time (LP: #1910133).
+		if [ -x "$(command -v zfs)" ] && modinfo zfs >/dev/null 2>&1; then
 			# if there is no mountpoint /var/lib/docker:
 			# 1: create <currentpool>/var/lib/docker if doesn’t exist (zfs mount?)
 			# /var/lib with canmount off if doesn’t exist