[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.4.2-645-g21c8856

[Aron Xu]

The following commit has been merged in the master branch:
commit 2110a3e397406a35e74819bfb488dd8dc301c7dc
Author: Aron Xu <aron at debian.org>
Date:   Thu Nov 5 20:34:22 2015 +0800

    Re-arrange file locations

diff --git a/debian/zfs-zed.install b/debian/zfs-zed.install
index e527e2c..f0ea073 100644
--- a/debian/zfs-zed.install
+++ b/debian/zfs-zed.install
@@ -1,5 +1,6 @@
 sbin/zed
-usr/lib/*/zfs/zed.d/*
 etc/init.d/zfs-zed
 etc/zfs/zed.d/*
+usr/lib/*/zfs/zed.d/*
 usr/lib/systemd/system/zed.service
+usr/share/man/man8/zed.8
diff --git a/debian/zfsutils-linux.examples b/debian/zfsutils-linux.examples
index e04d881..618e82c 100644
--- a/debian/zfsutils-linux.examples
+++ b/debian/zfsutils-linux.examples
@@ -2,56 +2,3 @@ etc/zfs/vdev_id.conf.alias.example
 etc/zfs/vdev_id.conf.multipath.example
 etc/zfs/vdev_id.conf.sas_direct.example
 etc/zfs/vdev_id.conf.sas_switch.example
-scripts/common.sh
-scripts/zconfig.sh
-scripts/zfault.sh
-scripts/zfs.sh
-scripts/zpios-profile/zpios-profile-disk.sh
-scripts/zpios-profile/zpios-profile-pids.sh
-scripts/zpios-profile/zpios-profile-post.sh
-scripts/zpios-profile/zpios-profile-pre.sh
-scripts/zpios-profile/zpios-profile.sh
-scripts/zpios-sanity.sh
-scripts/zpios-survey.sh
-scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh
-scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh
-scripts/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh
-scripts/zpios-test/256th-65536rc-4rs-1cs-4off.sh
-scripts/zpios-test/4th-1024rc-4rs-1cs-4off.sh
-scripts/zpios-test/large-thread-survey.sh
-scripts/zpios-test/large.sh
-scripts/zpios-test/lustre.sh
-scripts/zpios-test/medium.sh
-scripts/zpios-test/small.sh
-scripts/zpios-test/tiny.sh
-scripts/zpios.sh
-scripts/zpool-config/dm0-raid0.sh
-scripts/zpool-config/file-raid0.sh
-scripts/zpool-config/file-raid10.sh
-scripts/zpool-config/file-raidz.sh
-scripts/zpool-config/file-raidz2.sh
-scripts/zpool-config/hda-raid0.sh
-scripts/zpool-config/lo-faulty-raid0.sh
-scripts/zpool-config/lo-faulty-raid10.sh
-scripts/zpool-config/lo-faulty-raidz.sh
-scripts/zpool-config/lo-faulty-raidz2.sh
-scripts/zpool-config/lo-faulty-raidz3.sh
-scripts/zpool-config/lo-raid0.sh
-scripts/zpool-config/lo-raid10.sh
-scripts/zpool-config/lo-raidz.sh
-scripts/zpool-config/lo-raidz2.sh
-scripts/zpool-config/md0-raid10.sh
-scripts/zpool-config/md0-raid5.sh
-scripts/zpool-config/ram0-raid0.sh
-scripts/zpool-config/scsi_debug-noraid.sh
-scripts/zpool-config/scsi_debug-raid0.sh
-scripts/zpool-config/scsi_debug-raid10.sh
-scripts/zpool-config/scsi_debug-raidz.sh
-scripts/zpool-config/scsi_debug-raidz2.sh
-scripts/zpool-config/scsi_debug-raidz3.sh
-scripts/zpool-config/sda-raid0.sh
-scripts/zpool-config/zpool-raid0.sh
-scripts/zpool-config/zpool-raid10.sh
-scripts/zpool-config/zpool-raidz.sh
-scripts/zpool-create.sh
-debian/examples/zfsutils/*
diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index 0375f7a..24091f9 100644
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -1,11 +1,32 @@
 ../tree/zfsutils/* /
-lib/udev
-sbin
-bin
-usr/share/man
-usr/lib/modules-load.d/zfs.conf
+usr/lib/systemd/system/zfs*
+usr/lib/systemd/system-preset/
+usr/lib/modules-load.d/
+lib/udev/
 etc/default/zfs
-etc/init.d/zfs-*
-etc/zfs/*
-usr/share/zfs/*
-usr/lib/systemd/
+etc/init.d/zfs-share
+etc/init.d/zfs-mount
+etc/init.d/zfs-import
+etc/zfs/zfs-functions
+bin/
+sbin/fsck.zfs
+sbin/mount.zfs
+sbin/ztest
+sbin/zstreamdump
+sbin/zinject
+sbin/zhack
+sbin/zdb
+sbin/zpios
+sbin/zpool
+sbin/zfs
+usr/share/zfs/
+usr/share/man/man1/
+usr/share/man/man5/
+usr/share/man/man8/zstreamdump.8
+usr/share/man/man8/zpool.8
+usr/share/man/man8/zinject.8
+usr/share/man/man8/zfs.8
+usr/share/man/man8/zdb.8
+usr/share/man/man8/vdev_id.8
+usr/share/man/man8/mount.zfs.8
+usr/share/man/man8/fsck.zfs.8

-- 
OpenZFS on Linux