Rename of packages to avoid conflicts with bsd port

diff --git a/debian/control b/debian/control
index 112bea511fe45c7f0118e7543f1ac7ee2bf02971..59477d06470d0826ba033dc4c4578a66045526bc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Homepage: http://www.zfsonlinux.org/
 Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/zfs.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
 
-Package: libnvpair1
+Package: libnvpair1linux
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -30,7 +30,7 @@ Description: Solaris name-value library for Linux
  transporting data across process boundaries, transporting between
  kernel and userland, and possibly saving onto disk files.
 
-Package: libuutil1
+Package: libuutil1linux
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -45,10 +45,10 @@ Description: Solaris userland utility library for Linux
     partitioning.
   * libshare: NFS, SMB, and iSCSI service integration for ZFS.
 
-Package: libzfs-dev
+Package: libzfslinux-dev
 Section: libdevel
 Architecture: linux-any
-Depends: libzfs2 (= ${binary:Version}), ${misc:Depends}
+Depends: libzfs2linux (= ${binary:Version}), ${misc:Depends}
 Provides: libnvpair-dev, libuutil-dev
 Description: Native ZFS filesystem development files for Linux
  Header files and static libraries for compiling software  against
@@ -57,7 +57,7 @@ Description: Native ZFS filesystem development files for Linux
  This package includes the development files of libnvpair1, libuutil1,
  and libzfs2.
 
-Package: libzfs2
+Package: libzfs2linux
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -68,7 +68,7 @@ Description: Native ZFS filesystem library for Linux
  .
  The ZFS library provides support for managing ZFS filesystems.
 
-Package: libzpool1
+Package: libzpool1linux
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -83,7 +83,7 @@ Package: zfs-dkms
 Architecture: all
 Pre-Depends: spl-dkms (>= ${source:Upstream-Version})
 Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
-Recommends: zfsutils
+Recommends: zfsutils-linux
 Replaces: lzfs, lzfs-dkms
 Provides: lustre-backend-fs, lzfs, lzfs-dkms, zfs-modules
 Conflicts: lzfs, lzfs-dkms
@@ -96,7 +96,7 @@ Description: Native ZFS filesystem kernel modules for Linux
 
 Package: zfs-initramfs
 Architecture: linux-any
-Depends: initramfs-tools, zfs-modules | zfs-dkms, zfsutils, ${misc:Depends}
+Depends: initramfs-tools, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends}
 Description: Native ZFS root filesystem capabilities for Linux
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
@@ -105,7 +105,7 @@ Description: Native ZFS root filesystem capabilities for Linux
  This package adds ZFS to the system initramfs with a hook
  for the initramfs-tools infrastructure.
 
-Package: zfsutils
+Package: zfsutils-linux
 Section: admin
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -113,6 +113,7 @@ Recommends: lsb-base, zfs-modules | zfs-dkms
 Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
 Conflicts: zfs, zfs-fuse
 Replaces: zfs
+Provides: zfsutils
 Description: command-line tools to manage ZFS filesystems
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
@@ -125,16 +126,16 @@ Package: zfs-dbg
 Section: debug
 Priority: extra
 Architecture: linux-any
-Depends: libnvpair1 (= ${binary:Version}),
-         libuutil1 (= ${binary:Version}),
-         libzfs2 (= ${binary:Version}),
-         libzpool1 (= ${binary:Version}),
+Depends: libnvpair1linux (= ${binary:Version}),
+         libuutil1linux (= ${binary:Version}),
+         libzfs2linux (= ${binary:Version}),
+         libzpool1linux (= ${binary:Version}),
          ${misc:Depends}
-Recommends: zfsutils (= ${binary:Version})
+Recommends: zfsutils-linux (= ${binary:Version})
 Description: Debugging symbols for ZFS userland libraries and tools
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
  checksums.
  .
- This package contains the debugging symbols for libzpoo1, libzfs2,
- libnvpair1, libuutil1, and zfsutils.
+ This package contains the debugging symbols for libzpoo1linux, libzfs2linux,
+ libnvpair1linux, libuutil1linux, and zfsutils-linux.

diff --git a/debian/control.in b/debian/control.in
index 112bea511fe45c7f0118e7543f1ac7ee2bf02971..59477d06470d0826ba033dc4c4578a66045526bc 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -21,7 +21,7 @@ Homepage: http://www.zfsonlinux.org/
 Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/zfs.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
 
-Package: libnvpair1
+Package: libnvpair1linux
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -30,7 +30,7 @@ Description: Solaris name-value library for Linux
  transporting data across process boundaries, transporting between
  kernel and userland, and possibly saving onto disk files.
 
-Package: libuutil1
+Package: libuutil1linux
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -45,10 +45,10 @@ Description: Solaris userland utility library for Linux
     partitioning.
   * libshare: NFS, SMB, and iSCSI service integration for ZFS.
 
-Package: libzfs-dev
+Package: libzfslinux-dev
 Section: libdevel
 Architecture: linux-any
-Depends: libzfs2 (= ${binary:Version}), ${misc:Depends}
+Depends: libzfs2linux (= ${binary:Version}), ${misc:Depends}
 Provides: libnvpair-dev, libuutil-dev
 Description: Native ZFS filesystem development files for Linux
  Header files and static libraries for compiling software  against
@@ -57,7 +57,7 @@ Description: Native ZFS filesystem development files for Linux
  This package includes the development files of libnvpair1, libuutil1,
  and libzfs2.
 
-Package: libzfs2
+Package: libzfs2linux
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -68,7 +68,7 @@ Description: Native ZFS filesystem library for Linux
  .
  The ZFS library provides support for managing ZFS filesystems.
 
-Package: libzpool1
+Package: libzpool1linux
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -83,7 +83,7 @@ Package: zfs-dkms
 Architecture: all
 Pre-Depends: spl-dkms (>= ${source:Upstream-Version})
 Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
-Recommends: zfsutils
+Recommends: zfsutils-linux
 Replaces: lzfs, lzfs-dkms
 Provides: lustre-backend-fs, lzfs, lzfs-dkms, zfs-modules
 Conflicts: lzfs, lzfs-dkms
@@ -96,7 +96,7 @@ Description: Native ZFS filesystem kernel modules for Linux
 
 Package: zfs-initramfs
 Architecture: linux-any
-Depends: initramfs-tools, zfs-modules | zfs-dkms, zfsutils, ${misc:Depends}
+Depends: initramfs-tools, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends}
 Description: Native ZFS root filesystem capabilities for Linux
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
@@ -105,7 +105,7 @@ Description: Native ZFS root filesystem capabilities for Linux
  This package adds ZFS to the system initramfs with a hook
  for the initramfs-tools infrastructure.
 
-Package: zfsutils
+Package: zfsutils-linux
 Section: admin
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -113,6 +113,7 @@ Recommends: lsb-base, zfs-modules | zfs-dkms
 Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
 Conflicts: zfs, zfs-fuse
 Replaces: zfs
+Provides: zfsutils
 Description: command-line tools to manage ZFS filesystems
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
@@ -125,16 +126,16 @@ Package: zfs-dbg
 Section: debug
 Priority: extra
 Architecture: linux-any
-Depends: libnvpair1 (= ${binary:Version}),
-         libuutil1 (= ${binary:Version}),
-         libzfs2 (= ${binary:Version}),
-         libzpool1 (= ${binary:Version}),
+Depends: libnvpair1linux (= ${binary:Version}),
+         libuutil1linux (= ${binary:Version}),
+         libzfs2linux (= ${binary:Version}),
+         libzpool1linux (= ${binary:Version}),
          ${misc:Depends}
-Recommends: zfsutils (= ${binary:Version})
+Recommends: zfsutils-linux (= ${binary:Version})
 Description: Debugging symbols for ZFS userland libraries and tools
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
  checksums.
  .
- This package contains the debugging symbols for libzpoo1, libzfs2,
- libnvpair1, libuutil1, and zfsutils.
+ This package contains the debugging symbols for libzpoo1linux, libzfs2linux,
+ libnvpair1linux, libuutil1linux, and zfsutils-linux.

diff --git a/debian/libnvpair1-udeb.install b/debian/libnvpair1-udeb.install
deleted file mode 100644 (file)
index 9f3c105..0000000
--- a/debian/libnvpair1-udeb.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/libnvpair/.libs/libnvpair.so.*[0-9]        lib

diff --git a/debian/libnvpair1.docs b/debian/libnvpair1.docs
deleted file mode 100644 (file)
index 425a0e5..0000000
--- a/debian/libnvpair1.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-COPYRIGHT
-OPENSOLARIS.LICENSE

diff --git a/debian/libnvpair1.install b/debian/libnvpair1.install
deleted file mode 100644 (file)
index 34a0f61..0000000
--- a/debian/libnvpair1.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/libnvpair.so.*

diff --git a/debian/libnvpair1linux-udeb.install b/debian/libnvpair1linux-udeb.install
new file mode 100644 (file)
index 0000000..9f3c105
--- /dev/null
+++ b/debian/libnvpair1linux-udeb.install
@@ -0,0 +1 @@
+lib/libnvpair/.libs/libnvpair.so.*[0-9]        lib

diff --git a/debian/libnvpair1linux.docs b/debian/libnvpair1linux.docs
new file mode 100644 (file)
index 0000000..425a0e5
--- /dev/null
+++ b/debian/libnvpair1linux.docs
@@ -0,0 +1,2 @@
+COPYRIGHT
+OPENSOLARIS.LICENSE

diff --git a/debian/libnvpair1linux.install b/debian/libnvpair1linux.install
new file mode 100644 (file)
index 0000000..34a0f61
--- /dev/null
+++ b/debian/libnvpair1linux.install
@@ -0,0 +1 @@
+lib/libnvpair.so.*

diff --git a/debian/libuutil1-udeb.install b/debian/libuutil1-udeb.install
deleted file mode 100644 (file)
index eb549b6..0000000
--- a/debian/libuutil1-udeb.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/libuutil/.libs/libuutil.so.*[0-9]  lib

diff --git a/debian/libuutil1.docs b/debian/libuutil1.docs
deleted file mode 100644 (file)
index 425a0e5..0000000
--- a/debian/libuutil1.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-COPYRIGHT
-OPENSOLARIS.LICENSE

diff --git a/debian/libuutil1.install b/debian/libuutil1.install
deleted file mode 100644 (file)
index c7fa63e..0000000
--- a/debian/libuutil1.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/libuutil.so.*

diff --git a/debian/libuutil1linux-udeb.install b/debian/libuutil1linux-udeb.install
new file mode 100644 (file)
index 0000000..eb549b6
--- /dev/null
+++ b/debian/libuutil1linux-udeb.install
@@ -0,0 +1 @@
+lib/libuutil/.libs/libuutil.so.*[0-9]  lib

diff --git a/debian/libuutil1linux.docs b/debian/libuutil1linux.docs
new file mode 100644 (file)
index 0000000..425a0e5
--- /dev/null
+++ b/debian/libuutil1linux.docs
@@ -0,0 +1,2 @@
+COPYRIGHT
+OPENSOLARIS.LICENSE

diff --git a/debian/libuutil1linux.install b/debian/libuutil1linux.install
new file mode 100644 (file)
index 0000000..c7fa63e
--- /dev/null
+++ b/debian/libuutil1linux.install
@@ -0,0 +1 @@
+lib/libuutil.so.*

diff --git a/debian/libzfs-dev.docs b/debian/libzfs-dev.docs
deleted file mode 100644 (file)
index 425a0e5..0000000
--- a/debian/libzfs-dev.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-COPYRIGHT
-OPENSOLARIS.LICENSE

diff --git a/debian/libzfs-dev.install b/debian/libzfs-dev.install
deleted file mode 100644 (file)
index 3b97b97..0000000
--- a/debian/libzfs-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/*.a usr/lib/
-usr/include
-usr/lib/*.so

diff --git a/debian/libzfs2-udeb.install b/debian/libzfs2-udeb.install
deleted file mode 100644 (file)
index 307192a..0000000
--- a/debian/libzfs2-udeb.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/libzfs/.libs/libzfs.so.*[0-9]      lib

diff --git a/debian/libzfs2.docs b/debian/libzfs2.docs
deleted file mode 100644 (file)
index 425a0e5..0000000
--- a/debian/libzfs2.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-COPYRIGHT
-OPENSOLARIS.LICENSE

diff --git a/debian/libzfs2.install b/debian/libzfs2.install
deleted file mode 100644 (file)
index 660dede..0000000
--- a/debian/libzfs2.install
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/libzfs.so.*
-lib/libzfs_core.so.*

diff --git a/debian/libzfs2linux-udeb.install b/debian/libzfs2linux-udeb.install
new file mode 100644 (file)
index 0000000..307192a
--- /dev/null
+++ b/debian/libzfs2linux-udeb.install
@@ -0,0 +1 @@
+lib/libzfs/.libs/libzfs.so.*[0-9]      lib

diff --git a/debian/libzfs2linux.docs b/debian/libzfs2linux.docs
new file mode 100644 (file)
index 0000000..425a0e5
--- /dev/null
+++ b/debian/libzfs2linux.docs
@@ -0,0 +1,2 @@
+COPYRIGHT
+OPENSOLARIS.LICENSE

diff --git a/debian/libzfs2linux.install b/debian/libzfs2linux.install
new file mode 100644 (file)
index 0000000..660dede
--- /dev/null
+++ b/debian/libzfs2linux.install
@@ -0,0 +1,2 @@
+lib/libzfs.so.*
+lib/libzfs_core.so.*

diff --git a/debian/libzfslinux-dev.docs b/debian/libzfslinux-dev.docs
new file mode 100644 (file)
index 0000000..425a0e5
--- /dev/null
+++ b/debian/libzfslinux-dev.docs
@@ -0,0 +1,2 @@
+COPYRIGHT
+OPENSOLARIS.LICENSE

diff --git a/debian/libzfslinux-dev.install b/debian/libzfslinux-dev.install
new file mode 100644 (file)
index 0000000..3b97b97
--- /dev/null
+++ b/debian/libzfslinux-dev.install
@@ -0,0 +1,3 @@
+lib/*.a usr/lib/
+usr/include
+usr/lib/*.so

diff --git a/debian/libzpool1-udeb.install b/debian/libzpool1-udeb.install
deleted file mode 100644 (file)
index b5382a1..0000000
--- a/debian/libzpool1-udeb.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/libzpool/.libs/libzpool.so.*[0-9]  lib

diff --git a/debian/libzpool1.docs b/debian/libzpool1.docs
deleted file mode 100644 (file)
index 425a0e5..0000000
--- a/debian/libzpool1.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-COPYRIGHT
-OPENSOLARIS.LICENSE

diff --git a/debian/libzpool1.install b/debian/libzpool1.install
deleted file mode 100644 (file)
index d886d29..0000000
--- a/debian/libzpool1.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/libzpool.so.*

diff --git a/debian/libzpool1linux-udeb.install b/debian/libzpool1linux-udeb.install
new file mode 100644 (file)
index 0000000..b5382a1
--- /dev/null
+++ b/debian/libzpool1linux-udeb.install
@@ -0,0 +1 @@
+lib/libzpool/.libs/libzpool.so.*[0-9]  lib

diff --git a/debian/libzpool1linux.docs b/debian/libzpool1linux.docs
new file mode 100644 (file)
index 0000000..425a0e5
--- /dev/null
+++ b/debian/libzpool1linux.docs
@@ -0,0 +1,2 @@
+COPYRIGHT
+OPENSOLARIS.LICENSE

diff --git a/debian/libzpool1linux.install b/debian/libzpool1linux.install
new file mode 100644 (file)
index 0000000..d886d29
--- /dev/null
+++ b/debian/libzpool1linux.install
@@ -0,0 +1 @@
+lib/libzpool.so.*

diff --git a/debian/zfsutils-linux-udeb.install b/debian/zfsutils-linux-udeb.install
new file mode 100644 (file)
index 0000000..9d7064b
--- /dev/null
+++ b/debian/zfsutils-linux-udeb.install
@@ -0,0 +1,2 @@
+../tmp/lib/udev/*_id    /sbin
+../tmp/sbin/*  /sbin

diff --git a/debian/zfsutils-linux-udeb.isinstallable b/debian/zfsutils-linux-udeb.isinstallable
new file mode 100644 (file)
index 0000000..edad0f9
--- /dev/null
+++ b/debian/zfsutils-linux-udeb.isinstallable
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Require ZFS v28 in kernel
+exit 0

diff --git a/debian/zfsutils-linux.docs b/debian/zfsutils-linux.docs
new file mode 100644 (file)
index 0000000..425a0e5
--- /dev/null
+++ b/debian/zfsutils-linux.docs
@@ -0,0 +1,2 @@
+COPYRIGHT
+OPENSOLARIS.LICENSE

diff --git a/debian/zfsutils-linux.examples b/debian/zfsutils-linux.examples
new file mode 100644 (file)
index 0000000..e04d881
--- /dev/null
+++ b/debian/zfsutils-linux.examples
@@ -0,0 +1,57 @@
+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
new file mode 100644 (file)
index 0000000..bb06e7a
--- /dev/null
+++ b/debian/zfsutils-linux.install
@@ -0,0 +1,4 @@
+../tree/zfsutils/* /
+lib/udev
+sbin
+usr/share/man

diff --git a/debian/zfsutils-linux.postinst b/debian/zfsutils-linux.postinst
new file mode 100644 (file)
index 0000000..9ec0bb5
--- /dev/null
+++ b/debian/zfsutils-linux.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null
+then
+       dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
+       dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
+fi
+
+#DEBHELPER#

diff --git a/debian/zfsutils-linux.postrm b/debian/zfsutils-linux.postrm
new file mode 100644 (file)
index 0000000..9ec0bb5
--- /dev/null
+++ b/debian/zfsutils-linux.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null
+then
+       dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
+       dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
+fi
+
+#DEBHELPER#

diff --git a/debian/zfsutils-linux.preinst b/debian/zfsutils-linux.preinst
new file mode 100644 (file)
index 0000000..9ec0bb5
--- /dev/null
+++ b/debian/zfsutils-linux.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null
+then
+       dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
+       dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
+fi
+
+#DEBHELPER#

diff --git a/debian/zfsutils-linux.zfs-mount.init b/debian/zfsutils-linux.zfs-mount.init
new file mode 100644 (file)
index 0000000..40f7e50
--- /dev/null
+++ b/debian/zfsutils-linux.zfs-mount.init
@@ -0,0 +1,84 @@
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides: zvol zfs zfs-mount
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Mount ZFS filesystems
+# Description: Run the `zfs mount -a` or `zfs umount -a` command.
+#              This init script is deprecated and should be disabled in the
+#              /etc/default/zfs options file. Instead, use the zfs-mount
+#              package for Debian or the zfs-mountall package for Ubuntu
+### END INIT INFO
+
+PATH=/sbin:/bin
+
+. /lib/lsb/init-functions
+# Do not source /lib/init/*.sh as they are not public APIs after getting rid
+# of /lib/init/rw. However, this line may help when doing back port to older
+# releases.
+#
+#. /lib/init/vars.sh
+
+[ -f /etc/default/zfs ] && . /etc/default/zfs
+
+do_start()
+{
+       log_begin_msg "Mounting ZFS filesystems"
+       log_progress_msg "filesystems"
+       zfs mount -a
+       RET=$?
+
+       if [ $RET != 0 ] ; then
+               log_end_msg $RET
+               exit $RET
+       fi
+
+       log_end_msg 0
+}
+
+do_stop()
+{
+       log_begin_msg "Unmounting ZFS filesystems"
+       log_progress_msg "filesystems"
+       zfs unmount -a
+       RET=$?
+
+       # Ignore a non-zero `zfs` result so that a busy ZFS instance
+       # does not hang the system during shutdown.
+       if [ $RET != 0 ] ; then
+               log_end_msg $RET
+       fi
+
+       log_end_msg 0
+}
+
+case "$1" in
+       (start)
+               case "$ZFS_MOUNT" in
+                       ([Oo][Ff][Ff]|[Nn][Oo]|'')
+                               exit 0
+                               ;;
+               esac
+               do_start
+               ;;
+       (stop)
+               case "$ZFS_UNMOUNT" in
+                       ([Oo][Ff][Ff]|[Nn][Oo]|'')
+                               exit 0
+                               ;;
+               esac
+               do_stop
+               ;;
+       (force-reload|reload|restart|status)
+               # no-op
+               ;;
+
+       (*)
+               [ -n "$1" ] && echo "Error: Unknown command $1."
+               echo "Usage: $0 {start|stop}"
+               exit 3
+       ;;
+esac

diff --git a/debian/zfsutils-linux.zfs-share.init b/debian/zfsutils-linux.zfs-share.init
new file mode 100644 (file)
index 0000000..e7ba385
--- /dev/null
+++ b/debian/zfsutils-linux.zfs-share.init
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides: shareiscsi sharenfs sharesmb zfs-share
+# Required-Start: $local_fs $network $remote_fs
+# Required-Stop: $local_fs $network $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Should-Start: iscsi iscsitarget istgt nfs-kernel-server samba
+# Should-Stop: iscsi iscsitarget istgt nfs-kernel-server samba
+# Short-Description: Network share ZFS datasets.
+# Description: Run the `zfs share -a` or `zfs unmount -a` commands
+#      for controlling iSCSI, NFS, or CIFS network shares.
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+. /lib/lsb/init-functions
+# Do not source /lib/init/*.sh as they are not public APIs after getting rid
+# of /lib/init/rw. However, this line may help when doing back port to older
+# releases.
+#
+#. /lib/init/vars.sh
+
+[ -f /etc/default/zfs ] && . /etc/default/zfs
+
+do_start()
+{
+       log_begin_msg "Sharing ZFS filesystems"
+       log_progress_msg "filesystems"
+       zfs share -a
+       RET=$?
+
+       if [ $RET != 0 ] ; then
+               log_end_msg $RET
+               exit $RET
+       fi
+
+       log_end_msg 0
+}
+
+do_stop()
+{
+       log_begin_msg "Unsharing ZFS filesystems"
+       log_progress_msg "filesystems"
+       zfs unshare -a
+       RET=$?
+
+       # Ignore a non-zero `zfs` result so that a busy ZFS instance
+       # does not hang the system during shutdown.
+       if [ $RET != 0 ] ; then
+               log_end_msg $RET
+       fi
+
+       log_end_msg 0
+}
+
+case "$1" in
+       (start)
+               case "$ZFS_SHARE" in
+                       ([Oo][Ff][Ff]|[Nn][Oo]|'')
+                               exit 0
+                               ;;
+               esac
+               do_start
+               ;;
+       (stop)
+               case "$ZFS_UNSHARE" in
+                       ([Oo][Ff][Ff]|[Nn][Oo]|'')
+                               exit 0
+                               ;;
+               esac
+               do_stop
+               ;;
+       (force-reload|reload|restart|status)
+               # no-op
+               ;;
+
+       (*)
+               [ -n "$1" ] && echo "Error: Unknown command $1."
+               echo "Usage: $0 {start|stop}"
+               exit 3
+       ;;
+esac

diff --git a/debian/zfsutils-linux.zfs.default b/debian/zfsutils-linux.zfs.default
new file mode 100644 (file)
index 0000000..fcfed82
--- /dev/null
+++ b/debian/zfsutils-linux.zfs.default
@@ -0,0 +1,29 @@
+# ZoL userland configuration.
+
+# Run `zfs mount -a` during system start?
+# This should be 'no' if zfs-mountall or a systemd generator is available.
+ZFS_MOUNT='no'
+
+# Run `zfs unmount -a` during system stop?
+# This should be 'no' on most systems.
+ZFS_UNMOUNT='no'
+
+# Run `zfs share -a` during system start?
+# nb: The shareiscsi, sharenfs, and sharesmb dataset properties.
+ZFS_SHARE='no'
+
+# Run `zfs unshare -a` during system stop?
+ZFS_UNSHARE='no'
+
+# Build kernel modules with the --enable-debug switch?
+ZFS_DKMS_ENABLE_DEBUG='no'
+
+# Build kernel modules with the --enable-debug-dmu-tx switch?
+ZFS_DKMS_ENABLE_DEBUG_DMU_TX='no'
+
+# Keep debugging symbols in kernel modules?
+ZFS_DKMS_DISABLE_STRIP='no'
+
+# Wait for this many seconds in the initrd pre_mountroot?
+# This delays startup and should be '0' on most systems.
+ZFS_INITRD_PRE_MOUNTROOT_SLEEP='0'

diff --git a/debian/zfsutils-udeb.install b/debian/zfsutils-udeb.install
deleted file mode 100644 (file)
index 9d7064b..0000000
--- a/debian/zfsutils-udeb.install
+++ /dev/null
@@ -1,2 +0,0 @@
-../tmp/lib/udev/*_id    /sbin
-../tmp/sbin/*  /sbin

diff --git a/debian/zfsutils-udeb.isinstallable b/debian/zfsutils-udeb.isinstallable
deleted file mode 100644 (file)
index edad0f9..0000000
--- a/debian/zfsutils-udeb.isinstallable
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Require ZFS v28 in kernel
-exit 0

diff --git a/debian/zfsutils.docs b/debian/zfsutils.docs
deleted file mode 100644 (file)
index 425a0e5..0000000
--- a/debian/zfsutils.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-COPYRIGHT
-OPENSOLARIS.LICENSE

diff --git a/debian/zfsutils.examples b/debian/zfsutils.examples
deleted file mode 100644 (file)
index e04d881..0000000
--- a/debian/zfsutils.examples
+++ /dev/null
@@ -1,57 +0,0 @@
-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.install b/debian/zfsutils.install
deleted file mode 100644 (file)
index bb06e7a..0000000
--- a/debian/zfsutils.install
+++ /dev/null
@@ -1,4 +0,0 @@
-../tree/zfsutils/* /
-lib/udev
-sbin
-usr/share/man

diff --git a/debian/zfsutils.postinst b/debian/zfsutils.postinst
deleted file mode 100644 (file)
index 9ec0bb5..0000000
--- a/debian/zfsutils.postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null
-then
-       dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
-       dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
-fi
-
-#DEBHELPER#

diff --git a/debian/zfsutils.postrm b/debian/zfsutils.postrm
deleted file mode 100644 (file)
index 9ec0bb5..0000000
--- a/debian/zfsutils.postrm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null
-then
-       dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
-       dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
-fi
-
-#DEBHELPER#

diff --git a/debian/zfsutils.preinst b/debian/zfsutils.preinst
deleted file mode 100644 (file)
index 9ec0bb5..0000000
--- a/debian/zfsutils.preinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null
-then
-       dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
-       dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
-fi
-
-#DEBHELPER#

diff --git a/debian/zfsutils.zfs-mount.init b/debian/zfsutils.zfs-mount.init
deleted file mode 100644 (file)
index 40f7e50..0000000
--- a/debian/zfsutils.zfs-mount.init
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides: zvol zfs zfs-mount
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Mount ZFS filesystems
-# Description: Run the `zfs mount -a` or `zfs umount -a` command.
-#              This init script is deprecated and should be disabled in the
-#              /etc/default/zfs options file. Instead, use the zfs-mount
-#              package for Debian or the zfs-mountall package for Ubuntu
-### END INIT INFO
-
-PATH=/sbin:/bin
-
-. /lib/lsb/init-functions
-# Do not source /lib/init/*.sh as they are not public APIs after getting rid
-# of /lib/init/rw. However, this line may help when doing back port to older
-# releases.
-#
-#. /lib/init/vars.sh
-
-[ -f /etc/default/zfs ] && . /etc/default/zfs
-
-do_start()
-{
-       log_begin_msg "Mounting ZFS filesystems"
-       log_progress_msg "filesystems"
-       zfs mount -a
-       RET=$?
-
-       if [ $RET != 0 ] ; then
-               log_end_msg $RET
-               exit $RET
-       fi
-
-       log_end_msg 0
-}
-
-do_stop()
-{
-       log_begin_msg "Unmounting ZFS filesystems"
-       log_progress_msg "filesystems"
-       zfs unmount -a
-       RET=$?
-
-       # Ignore a non-zero `zfs` result so that a busy ZFS instance
-       # does not hang the system during shutdown.
-       if [ $RET != 0 ] ; then
-               log_end_msg $RET
-       fi
-
-       log_end_msg 0
-}
-
-case "$1" in
-       (start)
-               case "$ZFS_MOUNT" in
-                       ([Oo][Ff][Ff]|[Nn][Oo]|'')
-                               exit 0
-                               ;;
-               esac
-               do_start
-               ;;
-       (stop)
-               case "$ZFS_UNMOUNT" in
-                       ([Oo][Ff][Ff]|[Nn][Oo]|'')
-                               exit 0
-                               ;;
-               esac
-               do_stop
-               ;;
-       (force-reload|reload|restart|status)
-               # no-op
-               ;;
-
-       (*)
-               [ -n "$1" ] && echo "Error: Unknown command $1."
-               echo "Usage: $0 {start|stop}"
-               exit 3
-       ;;
-esac

diff --git a/debian/zfsutils.zfs-share.init b/debian/zfsutils.zfs-share.init
deleted file mode 100644 (file)
index e7ba385..0000000
--- a/debian/zfsutils.zfs-share.init
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides: shareiscsi sharenfs sharesmb zfs-share
-# Required-Start: $local_fs $network $remote_fs
-# Required-Stop: $local_fs $network $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Should-Start: iscsi iscsitarget istgt nfs-kernel-server samba
-# Should-Stop: iscsi iscsitarget istgt nfs-kernel-server samba
-# Short-Description: Network share ZFS datasets.
-# Description: Run the `zfs share -a` or `zfs unmount -a` commands
-#      for controlling iSCSI, NFS, or CIFS network shares.
-### END INIT INFO
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-. /lib/lsb/init-functions
-# Do not source /lib/init/*.sh as they are not public APIs after getting rid
-# of /lib/init/rw. However, this line may help when doing back port to older
-# releases.
-#
-#. /lib/init/vars.sh
-
-[ -f /etc/default/zfs ] && . /etc/default/zfs
-
-do_start()
-{
-       log_begin_msg "Sharing ZFS filesystems"
-       log_progress_msg "filesystems"
-       zfs share -a
-       RET=$?
-
-       if [ $RET != 0 ] ; then
-               log_end_msg $RET
-               exit $RET
-       fi
-
-       log_end_msg 0
-}
-
-do_stop()
-{
-       log_begin_msg "Unsharing ZFS filesystems"
-       log_progress_msg "filesystems"
-       zfs unshare -a
-       RET=$?
-
-       # Ignore a non-zero `zfs` result so that a busy ZFS instance
-       # does not hang the system during shutdown.
-       if [ $RET != 0 ] ; then
-               log_end_msg $RET
-       fi
-
-       log_end_msg 0
-}
-
-case "$1" in
-       (start)
-               case "$ZFS_SHARE" in
-                       ([Oo][Ff][Ff]|[Nn][Oo]|'')
-                               exit 0
-                               ;;
-               esac
-               do_start
-               ;;
-       (stop)
-               case "$ZFS_UNSHARE" in
-                       ([Oo][Ff][Ff]|[Nn][Oo]|'')
-                               exit 0
-                               ;;
-               esac
-               do_stop
-               ;;
-       (force-reload|reload|restart|status)
-               # no-op
-               ;;
-
-       (*)
-               [ -n "$1" ] && echo "Error: Unknown command $1."
-               echo "Usage: $0 {start|stop}"
-               exit 3
-       ;;
-esac

diff --git a/debian/zfsutils.zfs.default b/debian/zfsutils.zfs.default
deleted file mode 100644 (file)
index fcfed82..0000000
--- a/debian/zfsutils.zfs.default
+++ /dev/null
@@ -1,29 +0,0 @@
-# ZoL userland configuration.
-
-# Run `zfs mount -a` during system start?
-# This should be 'no' if zfs-mountall or a systemd generator is available.
-ZFS_MOUNT='no'
-
-# Run `zfs unmount -a` during system stop?
-# This should be 'no' on most systems.
-ZFS_UNMOUNT='no'
-
-# Run `zfs share -a` during system start?
-# nb: The shareiscsi, sharenfs, and sharesmb dataset properties.
-ZFS_SHARE='no'
-
-# Run `zfs unshare -a` during system stop?
-ZFS_UNSHARE='no'
-
-# Build kernel modules with the --enable-debug switch?
-ZFS_DKMS_ENABLE_DEBUG='no'
-
-# Build kernel modules with the --enable-debug-dmu-tx switch?
-ZFS_DKMS_ENABLE_DEBUG_DMU_TX='no'
-
-# Keep debugging symbols in kernel modules?
-ZFS_DKMS_DISABLE_STRIP='no'
-
-# Wait for this many seconds in the initrd pre_mountroot?
-# This delays startup and should be '0' on most systems.
-ZFS_INITRD_PRE_MOUNTROOT_SLEEP='0'