Merge pull request #645 from xnox/more-series

Try adding eoan & focal again

.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
 

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