From 9a4a79c0c1f8a3cc793581874d1cef60b5bcc951 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Thu, 5 Mar 2020 09:23:20 +0000
Subject: [PATCH 1/2] Try adding eoan & focal again

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e84d06a1..1f05d56c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ dist: xenial
 env:
   - IMAGE=ubuntu-daily:bionic SCRIPT="make lint"
   - IMAGE=ubuntu-daily:bionic SCRIPT=./scripts/runtests.sh
+  - IMAGE=ubuntu-daily:eoan SCRIPT=./scripts/runtests.sh
+  - IMAGE=ubuntu-daily:focal SCRIPT=./scripts/runtests.sh
 
 language: bash
 

From 897fe56213504a9c533fc2efcad37ef6a5aee298 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Thu, 5 Mar 2020 16:35:06 +0000
Subject: [PATCH 2/2] Try overriding zfs-mount.service

---
 scripts/installdeps.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/installdeps.sh b/scripts/installdeps.sh
index 06545ed2..3d5d6b99 100755
--- a/scripts/installdeps.sh
+++ b/scripts/installdeps.sh
@@ -4,6 +4,15 @@ set -eux
 cat /etc/apt/sources.list | sed -n 's/-updates/-proposed/p' > /etc/apt/sources.list.d/proposed.list
 apt-get update
 DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
+mkdir -p /etc/systemd/system/zfs-mount.service.d/
+cat >/etc/systemd/system/zfs-mount.service.d/override.conf <<EOF
+[Unit]
+After=zfs-load-module.service
+ConditionPathExists=/sys/module/zfs
+
+EOF
+cp -r /etc/systemd/system/zfs-mount.service.d/ /etc/systemd/system/zfs-share.service.d/
+systemctl daemon-reload
 apt-get install -y --no-install-recommends libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libsystemd-dev python3-distutils-extra pkg-config python3.5 python3-pip git lsb-release python3-setuptools gcc python3-dev python3-wheel curtin pep8 python3-pyflakes python3-bson
 pip3 install -r requirements.txt
 python3 setup.py build