From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] zfs: remove unused init scripts and add zed service
Date: Tue, 21 Jul 2020 18:01:33 +0200 [thread overview]
Message-ID: <20200721160133.D1WR0DFwzYVAmZEetIqXA9Hh_aY3WlLEBobaTPFX0z4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23689@inbox.vuxu.org>
[-- 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.
next prev parent reply other threads:[~2020-07-21 16:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 14:29 [PR PATCH] " ahesford
2020-07-21 15:24 ` zdykstra
2020-07-21 16:01 ` ahesford [this message]
2020-07-21 16:02 ` ahesford
2020-07-21 17:16 ` [PR REVIEW] " ericonr
2020-07-21 17:20 ` ahesford
2020-07-21 17:30 ` ericonr
2020-07-23 17:57 ` [PR PATCH] [Merged]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200721160133.D1WR0DFwzYVAmZEetIqXA9Hh_aY3WlLEBobaTPFX0z4@z \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).