Fix installation path of systemd files

The patch makes use of the --with-systemdunitdir configure parameter
which we do not set and which incorrectly defaults to
/usr/lib/systemd/system/.  (Debian uses /lib/systemd/system/.)  Amend
debian/rules to set that parameter. This obviates the need to specify
the /lib/systemd/system/ path in debian/zfs-zed.install and
debian/zfsutils-linux.install, so fix those up while at it.

Signed-off-by: Aron Xu <aron@debian.org>

diff --git a/debian/rules b/debian/rules
index 15e05927733369be4f4c8356a94fcea23789686d..6dfb8c12efc67948f34f507cb18cbb5a8ee9a0b3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,8 @@ endif
          --sbindir=/sbin \
          --libdir=/lib \
          --with-udevdir=/lib/udev \
+         --with-systemdunitdir=/lib/systemd/system \
+         --with-systemdpresetdir=/lib/systemd/system-preset \
          --with-config=user
 
 override_dh_auto_test:

diff --git a/debian/zfs-zed.install b/debian/zfs-zed.install
index a84fff75a1bc4c459da0ea4588957a0d951ad4c0..bc711e6071f39f075cd5910df9fa098081f7a1df 100644 (file)
--- a/debian/zfs-zed.install
+++ b/debian/zfs-zed.install
@@ -1,5 +1,5 @@
 usr/sbin/zed
 etc/zfs/zed.d/*
 usr/lib/*/zfs/zed.d/*
-usr/lib/systemd/system/zfs-zed.service lib/systemd/system/
+lib/systemd/system/zfs-zed.service
 usr/share/man/man8/zed.8

diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index 4407aa518560917cbdcc9c16623f4a822724d11a..947ffd91cd88b139e79f3357a0b79b2062094df9 100644 (file)
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -1,10 +1,10 @@
 ../tree/zfsutils-linux/* /
-usr/lib/systemd/system/zfs-mount.service lib/systemd/system/
-usr/lib/systemd/system/zfs-share.service lib/systemd/system/
-usr/lib/systemd/system/zfs-import-scan.service lib/systemd/system/
-usr/lib/systemd/system/zfs-import-cache.service lib/systemd/system/
-usr/lib/systemd/system/zfs.target lib/systemd/system/
-usr/lib/systemd/system-preset/ lib/systemd/
+lib/systemd/system/zfs-mount.service
+lib/systemd/system/zfs-share.service
+lib/systemd/system/zfs-import-scan.service
+lib/systemd/system/zfs-import-cache.service
+lib/systemd/system/zfs.target
+lib/systemd/system-preset/
 usr/lib/modules-load.d/ lib/
 lib/udev/
 etc/default/zfs