[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. debian/0.6.5.8-3-5-g94b699f

[Aron Xu]

The following commit has been merged in the master branch:
commit 58907cc6bf85f30ebcf577a97e1e6877f264f65b
Author: Lukas Wunner <lukas at wunner.de>
Date:   Sat Jan 28 02:37:31 2017 +0800

    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 at debian.org>

diff --git a/debian/rules b/debian/rules
index 15e0592..6dfb8c1 100755
--- 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 a84fff7..bc711e6 100644
--- 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 4407aa5..947ffd9 100644
--- 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

-- 
OpenZFS on Linux