From 2ad6c7f9e150e9c2fa146891785b09465aa0c7e5 Mon Sep 17 00:00:00 2001 From: Mo Zhou Date: Fri, 26 Oct 2018 06:53:13 +0000 Subject: [PATCH] Install init scripts to support non-systemd setups. (Closes: #826994) Thanks to Chris Dos Gbp-Dch: Full --- debian/patches/1004-zed-service-bindir.patch | 12 ++++++++++++ debian/rules | 8 ++++++++ debian/zfs-zed.zfs-share.init | 1 + debian/zfs-zed.zfs-zed.init | 1 + debian/zfsutils-linux.zfs-import.init | 1 + debian/zfsutils-linux.zfs-mount.init | 1 + 6 files changed, 24 insertions(+) create mode 120000 debian/zfs-zed.zfs-share.init create mode 120000 debian/zfs-zed.zfs-zed.init create mode 120000 debian/zfsutils-linux.zfs-import.init create mode 120000 debian/zfsutils-linux.zfs-mount.init diff --git a/debian/patches/1004-zed-service-bindir.patch b/debian/patches/1004-zed-service-bindir.patch index 81c301e4..5fba58ff 100644 --- a/debian/patches/1004-zed-service-bindir.patch +++ b/debian/patches/1004-zed-service-bindir.patch @@ -5,7 +5,9 @@ Description: Fix the path to the zed binary on the systemd unit. zfs-zed unit. Author: Carlos Alberto Lopez Author: Fabian Grünbichler +Author: Chris Dos Bug-Debian: https://bugs.debian.org/849813 +Bug-Debian: https://bugs.debian.org/826994 Forwarded: no --- a/etc/systemd/system/zfs-zed.service.in +++ b/etc/systemd/system/zfs-zed.service.in @@ -18,3 +20,13 @@ Forwarded: no Restart=on-abort [Install] +--- a/etc/init.d/zfs-functions.in ++++ b/etc/init.d/zfs-functions.in +@@ -89,7 +89,7 @@ + + # Paths to what we need + ZFS="@sbindir@/zfs" +-ZED="@sbindir@/zed" ++ZED="/usr/sbin/zed" + ZPOOL="@sbindir@/zpool" + ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache" diff --git a/debian/rules b/debian/rules index ddaccbd9..04789eb1 100755 --- a/debian/rules +++ b/debian/rules @@ -153,6 +153,14 @@ override_dh_install: find . -name lib*.la -delete dh_install --fail-missing +override_dh_installinit: + dh_installinit -r --no-start --name zfs-import + dh_installinit -r --no-start --name zfs-mount + dh_installinit -r --no-start --name zfs-share + dh_installinit -r --no-start --name zfs-zed + ln -sr /dev/null \ + debian/zfsutils-linux/lib/systemd/system/zfs-import.service + # ------------ override_dh_prep-deb-files: diff --git a/debian/zfs-zed.zfs-share.init b/debian/zfs-zed.zfs-share.init new file mode 120000 index 00000000..3f069f9b --- /dev/null +++ b/debian/zfs-zed.zfs-share.init @@ -0,0 +1 @@ +../etc/init.d/zfs-share \ No newline at end of file diff --git a/debian/zfs-zed.zfs-zed.init b/debian/zfs-zed.zfs-zed.init new file mode 120000 index 00000000..3f41f681 --- /dev/null +++ b/debian/zfs-zed.zfs-zed.init @@ -0,0 +1 @@ +../etc/init.d/zfs-zed \ No newline at end of file diff --git a/debian/zfsutils-linux.zfs-import.init b/debian/zfsutils-linux.zfs-import.init new file mode 120000 index 00000000..bfc368fd --- /dev/null +++ b/debian/zfsutils-linux.zfs-import.init @@ -0,0 +1 @@ +../etc/init.d/zfs-import \ No newline at end of file diff --git a/debian/zfsutils-linux.zfs-mount.init b/debian/zfsutils-linux.zfs-mount.init new file mode 120000 index 00000000..62a54433 --- /dev/null +++ b/debian/zfsutils-linux.zfs-mount.init @@ -0,0 +1 @@ +../etc/init.d/zfs-mount \ No newline at end of file -- 2.39.2