[PR PATCH] zfs: remove unused init scripts and add zed service

[PR PATCH] zfs: remove unused init scripts and add zed service

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages zfs
https://github.com/void-linux/void-packages/pull/23689

zfs: remove unused init scripts and add zed service
Small changes to:
1. Remove `/etc/init.d` scripts that aren't used in Void,
2. Remove `/etc/default/zfs` config script that isn't used, and
3. Add a service to run `zed`.

@Vaelatern @zdykstra @ericonr

A patch file from https://github.com/void-linux/void-packages/pull/23689.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zfs-23689.patch --]
[-- Type: text/x-diff, Size: 1903 bytes --]

From 8bf826c2b651a800ef6668c576951a9f6be7eb89 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Jul 2020 10:26:14 -0400
Subject: [PATCH] zfs: remove unused init scripts and add zed service

---
 srcpkgs/zfs/files/zed/run | 3 +++
 srcpkgs/zfs/template      | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/zfs/files/zed/run

diff --git a/srcpkgs/zfs/files/zed/run b/srcpkgs/zfs/files/zed/run
new file mode 100755
index 00000000000..0e3c1a4f53d
--- /dev/null
+++ b/srcpkgs/zfs/files/zed/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . conf
+exec zed -F $OPTS
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 0bcec381467..daf46b88531 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=0.8.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
@@ -37,6 +37,8 @@ post_install() {
 	vlicense LICENSE
 	vlicense NOTICE
 
+	vsv zed
+
 	vmkdir usr/src/${pkgname}-${version}
 	tar xf ../clean.tar.gz -C ${DESTDIR}/usr/src/${pkgname}-${version}
 	scripts/dkms.mkconf -v ${version} -f ${DESTDIR}/usr/src/${pkgname}-${version}/dkms.conf -n zfs
@@ -44,8 +46,11 @@ post_install() {
 		-e 's/test "${PYTHON_VERSION:0:2}" = "2."/test "${PYTHON_VERSION##2.*}" = ""/' \
 		${DESTDIR}/usr/src/${pkgname}-${version}/configure # This is necessary because of https://github.com/zfsonlinux/zfs/issues/8827
 
+	# Remove init and service control pieces not used in Void
 	rm -rf ${DESTDIR}/usr/lib/systemd
 	rm -rf ${DESTDIR}/usr/share/initramfs-tools
+	rm -rf ${DESTDIR}/etc/init.d
+	rm -rf ${DESTDIR}/etc/default
 
 	# Contains ELF binaries. Remove it until upstream has a way to move this
 	# into /usr/libexec or similiar.

Re: zfs: remove unused init scripts and add zed service

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/23689#issuecomment-661928088

Comment:
It's possible that `/etc/zfs/zfs-functions` can also be removed. The only references I can find to that file are in the errant `/etc/init.d/zfs-*` scripts that are being purged as part of this PR. I can test removing that as well tonight.

Re: [PR PATCH] [Updated] zfs: remove unused init scripts and add zed service

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 545 bytes --]

There is an updated pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages zfs
https://github.com/void-linux/void-packages/pull/23689

zfs: remove unused init scripts and add zed service
Small changes to:
1. Remove `/etc/init.d` scripts that aren't used in Void,
2. Remove `/etc/default/zfs` config script that isn't used, and
3. Add a service to run `zed`.

@Vaelatern @zdykstra @ericonr

A patch file from https://github.com/void-linux/void-packages/pull/23689.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zfs-23689.patch --]
[-- Type: text/x-diff, Size: 1946 bytes --]

From c4b3a4c5002faa4fa8df4c9e761465cd12ae6ae4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Jul 2020 10:26:14 -0400
Subject: [PATCH] zfs: remove unused init scripts and add zed service

---
 srcpkgs/zfs/files/zed/run | 3 +++
 srcpkgs/zfs/template      | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/zfs/files/zed/run

diff --git a/srcpkgs/zfs/files/zed/run b/srcpkgs/zfs/files/zed/run
new file mode 100755
index 00000000000..0e3c1a4f53d
--- /dev/null
+++ b/srcpkgs/zfs/files/zed/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . conf
+exec zed -F $OPTS
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 0bcec381467..8042fd77af3 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=0.8.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
@@ -37,6 +37,8 @@ post_install() {
 	vlicense LICENSE
 	vlicense NOTICE
 
+	vsv zed
+
 	vmkdir usr/src/${pkgname}-${version}
 	tar xf ../clean.tar.gz -C ${DESTDIR}/usr/src/${pkgname}-${version}
 	scripts/dkms.mkconf -v ${version} -f ${DESTDIR}/usr/src/${pkgname}-${version}/dkms.conf -n zfs
@@ -44,8 +46,12 @@ post_install() {
 		-e 's/test "${PYTHON_VERSION:0:2}" = "2."/test "${PYTHON_VERSION##2.*}" = ""/' \
 		${DESTDIR}/usr/src/${pkgname}-${version}/configure # This is necessary because of https://github.com/zfsonlinux/zfs/issues/8827
 
+	# Remove init and service control pieces not used in Void
 	rm -rf ${DESTDIR}/usr/lib/systemd
 	rm -rf ${DESTDIR}/usr/share/initramfs-tools
+	rm -rf ${DESTDIR}/etc/init.d
+	rm -rf ${DESTDIR}/etc/default
+	rm -f ${DESTDIR}/etc/zfs/zfs-functions
 
 	# Contains ELF binaries. Remove it until upstream has a way to move this
 	# into /usr/libexec or similiar.

Re: zfs: remove unused init scripts and add zed service

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23689#issuecomment-661950177

Comment:
You're right, and it says it's intended for the `init.d` scripts right at the top. Removed.

Re: [PR REVIEW] zfs: remove unused init scripts and add zed service

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23689#discussion_r458260192

Comment:
Is this a recommended service?

Re: [PR REVIEW] zfs: remove unused init scripts and add zed service

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23689#discussion_r458262626

Comment:
It's useful if you care about receiving notifications for ZFS events, but I'm not sure I'd call it "recommended".

Re: [PR REVIEW] zfs: remove unused init scripts and add zed service

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23689#discussion_r458268750

Comment:
Fair enough. Just wondering about the docs side of it c:

Thanks

Re: [PR PATCH] [Merged]: zfs: remove unused init scripts and add zed service

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 439 bytes --]

There's a merged pull request on the void-packages repository

zfs: remove unused init scripts and add zed service
https://github.com/void-linux/void-packages/pull/23689

Description:
Small changes to:
1. Remove `/etc/init.d` scripts that aren't used in Void,
2. Remove `/etc/default/zfs` config script that isn't used, and
3. Add a service to run `zed`.

[edit: also remove `/etc/zfs/zfs-functions`]

@Vaelatern @zdykstra @ericonr