From a129a0ec09ccae690d474c4adf7e8e303261b16e Mon Sep 17 00:00:00 2001
From: Dominik Honnef <dominik@honnef.co>
Date: Sun, 15 May 2016 15:14:10 +0200
Subject: [PATCH] zfs: remove zfs-import service

The service has several flaws:

1) The sequences 'start' and 'start, stop, start' produce different
system states. The first invocation of start will import and mount all
file systems. Stopping the service will unmount them, but not export
them. Running start again will not do anything, leaving the user with
unmounted file systems.

2) It imports all storage pools, not just those that are noted in the
cache. It's usually ill-advised to import all available pools.

3) It is different from all the other file systems and storage layers
that Void supports, which are all handled in stage 1.

This change depends on voidlinux/void-runit#46 for the replacement
solution.
---
 srcpkgs/zfs/files/zfs-import/finish | 5 -----
 srcpkgs/zfs/files/zfs-import/run    | 4 ----
 srcpkgs/zfs/template                | 4 +---
 3 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100755 srcpkgs/zfs/files/zfs-import/finish
 delete mode 100755 srcpkgs/zfs/files/zfs-import/run

diff --git a/srcpkgs/zfs/files/zfs-import/finish b/srcpkgs/zfs/files/zfs-import/finish
deleted file mode 100755
index 0d4030803be..00000000000
--- a/srcpkgs/zfs/files/zfs-import/finish
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-exec 2>&1
-zfs unshare -a
-zfs unmount -a
diff --git a/srcpkgs/zfs/files/zfs-import/run b/srcpkgs/zfs/files/zfs-import/run
deleted file mode 100755
index c833a6b8568..00000000000
--- a/srcpkgs/zfs/files/zfs-import/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-exec 2>&1
-zpool import -a || exit 1
-exec chpst -b zfs-import pause
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 81e98845141..1e3f689151e 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=0.6.5.7
-revision=1
+revision=2
 patch_args="-Np1"
 wrksrc="${pkgname}-${pkgname}-${version/r/-}"
 build_style=gnu-configure
@@ -34,8 +34,6 @@ post_install() {
 	tar xf ../clean.tar.gz -C ${DESTDIR}/usr/src/${pkgname}-${version/r/-}
 	scripts/dkms.mkconf -v ${version/r/-} -f ${DESTDIR}/usr/src/${pkgname}-${version/r/-}/dkms.conf -n zfs
 
-	vsv zfs-import
-
 	rm -rf ${DESTDIR}/usr/lib/systemd
 	rm -rf ${DESTDIR}/usr/share/initramfs-tools
 }