]> git.proxmox.com Git - mirror_zfs-debian.git/commitdiff
Merge branch 'upstream'
authorDarik Horn <dajhorn@vanadac.com>
Fri, 22 Jul 2011 00:07:33 +0000 (19:07 -0500)
committerDarik Horn <dajhorn@vanadac.com>
Fri, 22 Jul 2011 00:07:33 +0000 (19:07 -0500)
62 files changed:
.pc/.quilt_patches [new file with mode: 0644]
.pc/.quilt_series [new file with mode: 0644]
.pc/.version [new file with mode: 0644]
autogen.sh [changed mode: 0644->0755]
debian/NEWS [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/debuild-ppa.sh [new file with mode: 0755]
debian/libefi1.docs [new file with mode: 0644]
debian/libefi1.install [new file with mode: 0644]
debian/libnvpair1.docs [new file with mode: 0644]
debian/libnvpair1.install [new file with mode: 0644]
debian/libshare1.install [new file with mode: 0644]
debian/libspl1.docs [new file with mode: 0644]
debian/libspl1.install [new file with mode: 0644]
debian/libunicode1.docs [new file with mode: 0644]
debian/libunicode1.install [new file with mode: 0644]
debian/libuutil1.docs [new file with mode: 0644]
debian/libuutil1.install [new file with mode: 0644]
debian/libzavl1.docs [new file with mode: 0644]
debian/libzavl1.install [new file with mode: 0644]
debian/libzfs-dev.docs [new file with mode: 0644]
debian/libzfs-dev.install [new file with mode: 0644]
debian/libzfs1.docs [new file with mode: 0644]
debian/libzfs1.install [new file with mode: 0644]
debian/libzpool1.docs [new file with mode: 0644]
debian/libzpool1.install [new file with mode: 0644]
debian/patches/disable-dist-init.patch [new file with mode: 0644]
debian/patches/disable-dist-scripts.patch [new file with mode: 0644]
debian/patches/lintian-COPYING.patch [new file with mode: 0644]
debian/patches/lintian-ltmain.patch [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/patches/volatile-version.patch [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]
debian/source/options [new file with mode: 0644]
debian/tree/zfs-initramfs/usr/share/initramfs-tools/conf-hooks.d/zfs [new file with mode: 0644]
debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zfs [new file with mode: 0755]
debian/tree/zfs-initramfs/usr/share/initramfs-tools/scripts/zfs [new file with mode: 0644]
debian/watch [new file with mode: 0644]
debian/zfs-dkms.dkms [new file with mode: 0644]
debian/zfs-dkms.docs [new file with mode: 0644]
debian/zfs-dkms.install [new file with mode: 0644]
debian/zfs-dkms.postinst [new file with mode: 0644]
debian/zfs-dkms.prerm [new file with mode: 0644]
debian/zfs-dracut.install [new file with mode: 0644]
debian/zfs-initramfs.install [new file with mode: 0644]
debian/zfs-initramfs.preinst [new file with mode: 0644]
debian/zfsutils.docs [new file with mode: 0644]
debian/zfsutils.examples [new file with mode: 0644]
debian/zfsutils.install [new file with mode: 0644]
debian/zfsutils.preinst [new file with mode: 0644]
debian/zfsutils.zfs.default [new file with mode: 0644]
debian/zfsutils.zfs.init [new file with mode: 0644]
lib/libspl/asm-generic/atomic.S [deleted file]
scripts/zpios-test/large-thread-survey.sh [changed from symlink to file mode: 0755]
scripts/zpios-test/large.sh [changed from symlink to file mode: 0755]
scripts/zpios-test/medium.sh [changed from symlink to file mode: 0755]
scripts/zpios-test/small.sh [changed from symlink to file mode: 0755]
scripts/zpios-test/tiny.sh [changed from symlink to file mode: 0755]

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644 (file)
index 0000000..6857a8d
--- /dev/null
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644 (file)
index 0000000..c206706
--- /dev/null
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644 (file)
index 0000000..0cfbf08
--- /dev/null
@@ -0,0 +1 @@
+2
old mode 100644 (file)
new mode 100755 (executable)
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644 (file)
index 0000000..bbcf097
--- /dev/null
@@ -0,0 +1,12 @@
+zfs-linux (0.6.0.7-0ubuntu2) unstable; urgency=medium
+
+  NOTE:  The removal of the zfs or zfs-lib package by this
+         upgrade, either now or later, is expected and safe.
+
+  Please ensure that the ubuntu-zfs package is installed so
+  that the upgrade happens automatically.
+
+  This is happening so that the ZFS packages for Linux are
+  more like the packages already in Debian kFreeBSD.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Thu, 07 Apr 2011 13:51:23 -0500
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..c727402
--- /dev/null
@@ -0,0 +1,630 @@
+zfs-linux (0.6.0.26-0ubuntu1) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Fix send/recv 'dataset is busy' errors
+  * Update 'zpool import' man page
+  * Fix mmap(2)/write(2)/read(2) deadlock
+  * Fix zio_execute() deadlock
+  * Fix zpl_writepage() deadlock
+  * Fix 'make install' overly broad 'rm'
+  * Honor setgit bit on directories
+
+ -- Darik Horn <dajhorn@vanadac.com>  Wed, 20 Jul 2011 18:27:15 -0500
+
+zfs-linux (0.6.0.25.rc5-0ubuntu4) unstable; urgency=low
+
+  * Add fix-issue-319 patch.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Fri, 15 Jul 2011 20:09:22 -0500
+
+zfs-linux (0.6.0.25.rc5-0ubuntu3) unstable; urgency=low
+
+  * Stub the Makefile.in files in scripts/.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Fri, 15 Jul 2011 08:45:00 -0500
+
+zfs-linux (0.6.0.25.rc5-0ubuntu1) unstable; urgency=low
+
+  [ Andrew Tselischev ]
+  * Fix 'rc_parallel="YES"' error
+
+  [ Prasad Joshi ]
+  * Use consistent error message in zpool sub-command
+
+  [ Gunnar Beutner ]
+  * Fixed indentation in the zfs.lunar init script.
+  * Removed erroneous backticks in the zfs.lunar init script.
+  * Implemented sharing datasets via NFS using libshare.
+  * Link libshare directly to libzfs
+  * Renamed HAVE_SHARE ifdefs to HAVE_SMB_SHARE.
+  * Updated init scripts to enable automatic sharing of ZFS datasets.
+
+  [ Zachary Bedell ]
+  * Update zfs.gentoo/zfs.lsb init script
+  * Update for Dracut-010
+  * Document initramfs process
+
+  [ Brian Behlendorf ]
+  * Add proper library versioning
+  * Update ztest paths
+  * Update 'zfs send' documentation
+  * Add L2ARC tunables
+  * Improve fstat(2) performance
+
+  [ Darik Horn ]
+  * Refresh patches.
+  * Set the configuration prefix to root.
+  * Remove /usr/bin/hostid from the initramfs image.
+  * Add zfs-dracut package.
+  * Add libshare0 package.
+  * Disable disable-dist-init.patch
+  * Add nfs-kernel-server suggestion.
+  * Demote spl-dkms to a regular dependency.
+  * lintian: package-name-doesnt-match-sonames
+  * lintian: incorrect-libdir-in-la-file
+  * Rename libavl1 to libzavl1.
+
+  [ Fajar A. Nugraha ]
+  * Check for "udevadm settle" vs "udevsettle"
+  * Remove zfs service only on uninstall, not on upgrade
+
+  [ Kyle Fuller ]
+  * Provide a rc.d script for archlinux
+
+ -- Darik Horn <dajhorn@vanadac.com>  Tue, 12 Jul 2011 19:49:02 -0500
+
+zfs-linux (0.6.0.22.rc5-0ubuntu1) unstable; urgency=low
+
+  [ Prasad Joshi ]
+  * MMAP Optimization
+
+  [ Brian Behlendorf ]
+  * Remove unused MMAP functions
+  * Add ZFS specific mmap() checks
+  * Avoid 'rpm -q' bug for 'make pkg'
+  * Linux compat 2.6.39: security_inode_init_security()
+  * Linux compat 2.6.39: mount_nodev()
+  * Fix implicit declaration of 'mkdirp'
+  * Always allow non-user xattrs
+  * Prep zfs-0.6.0-rc5 tag
+
+  [ Rohan Puri ]
+  * Support mandatory locks (nbmand)
+
+ -- Darik Horn <dajhorn@vanadac.com>  Sun, 03 Jul 2011 13:06:48 -0500
+
+zfs-linux (0.6.0.21-0ubuntu1) unstable; urgency=low
+
+  [ Prasad Joshi ]
+  * Tear down and flush the mmap region
+  * Use truncate_setsize in zfs_setattr
+
+  [ Brian Behlendorf ]
+  * Ensure all block devices are available
+
+ -- Darik Horn <dajhorn@vanadac.com>  Fri, 01 Jul 2011 11:41:40 -0500
+
+zfs-linux (0.6.0.20-0ubuntu1) unstable; urgency=low
+
+  [ Gunnar Beutner ]
+  * Removed erroneous zfs_inode_destroy() calls from zfs_rmnode().
+  * Fix unlink/xattr deadlock
+
+  [ Brian Behlendorf ]
+  * Linux 3.0 compat, shrinker compatibility
+
+  [ Ned A. Bass ]
+  * Multipath device manageability improvements
+
+ -- Darik Horn <dajhorn@vanadac.com>  Sat, 25 Jun 2011 22:14:26 -0500
+
+zfs-linux (0.6.0.19-0ubuntu1) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Use datadir not datarootdir for dracut
+  * Update rpm/deb packages to be FHS compliant
+  * Linux 2.6.37 compat, WRITE_FLUSH_FUA
+
+  [ Christian Kohlschütter ]
+  * Add "ashift" property to zpool create
+
+  [ Darik Horn ]
+  * Fix autoconf variable substitution in udev rules.
+  * Autogen refresh.
+  * Refresh patches.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Sun, 19 Jun 2011 13:06:43 -0500
+
+zfs-linux (0.6.0.18-0ubuntu1) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Fix 'zfs send -D' segfault
+  * Pass -f option for import
+  * Add default stack checking
+  * Check for -Wno-unused-but-set-variable gcc support
+  * Always check -Wno-unused-but-set-variable gcc support
+  * Handle /etc/mtab -> /proc/mounts symlink
+
+ -- Darik Horn <dajhorn@vanadac.com>  Thu, 16 Jun 2011 09:39:30 -0500
+
+zfs-linux (0.6.0.17-0ubuntu1) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Make tgx_sync_thread zio's async
+  * Revert "Fix stack traverse_visitbp()"
+  * Fix stack ddt_zap_lookup()
+  * Fix stack ddt_class_contains()
+  * Fix zpios-sanity.sh return code
+  * Always unload zpios.ko on exit
+  * Delay before destroying loopback devices
+  * Sanatize zpios-sanity.sh environment
+
+ -- Darik Horn <dajhorn@vanadac.com>  Sun, 05 Jun 2011 20:32:51 -0500
+
+zfs-linux (0.6.0.16-0ubuntu1) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Pass caller's credential in zfsdev_ioctl()
+  * Default to internal 'zfs userspace' implementation
+  * Use vmem_alloc() for zfs_ioc_userspace_many()
+  * Fix 4K sector support
+
+ -- Darik Horn <dajhorn@vanadac.com>  Sat, 28 May 2011 15:47:15 -0500
+
+zfs-linux (0.6.0.15-0ubuntu1) unstable; urgency=low
+
+  [ Alexey Shvetsov ]
+  * Make zfs.gentoo init script more gentoo style.
+  * Fix zfs.gentoo init script logic
+  * Remove root 'ls' after mount workaround
+  * Fix distribution detection for gentoo
+
+  [ Brian Behlendorf ]
+  * Update synchronous open zfs_close() comment
+  * Fix 'negative objects to delete' warning
+
+ -- Darik Horn <dajhorn@vanadac.com>  Mon, 23 May 2011 09:18:38 -0500
+
+zfs-linux (0.6.0.14-0ubuntu1) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Use vmem_alloc() for zfs_ioc_pool_get_history()
+  * Fix awk usage
+  * Handle NULL in nfsd .fsync() hook
+  * Disable direct reclaim for z_wr_* threads
+
+  [ Ned A. Bass ]
+  * Don't store rdev in SA for FIFOs and sockets
+
+ -- Darik Horn <dajhorn@vanadac.com>  Wed, 11 May 2011 20:28:21 -0500
+
+zfs-linux (0.6.0.13.rc4-0ubuntu1) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Add missing ZFS tunables
+  * Allow mounting of read-only snapshots
+
+ -- Darik Horn <dajhorn@vanadac.com>  Thu, 05 May 2011 20:48:14 -0500
+
+zfs-linux (0.6.0.12.rc4-0ubuntu2) unstable; urgency=low
+
+  * Add the debhelper token to zfs-initramfs.preinst
+  * Add the debehelper token to zfsutils.preinst
+  * Add extended package descriptions.
+  * Disable zpool-layout distribution.
+  * Add -e switch to the zfsutils.preinst whackbang.
+  * Add docs file for each package.
+  * Package libexec scripts as examples.
+  * Add -e switch to the zfs-initramfs.preinst whackbang.
+  * Flag autogen.sh as executable.
+  * Add -e switch to the zfs-dkms.postinst whackbang.
+  * Disable scripts distribution.
+  * Add whackbang to the ltmain.sh script.
+  * Remove unused zfs-dkms.preinst script.
+  * Add -e switch to the zfs-dkms.prerm whackbang.
+  * Remove unused zfs-dkms.postrm script.
+  * Specify a distro section for each package.
+  * Add snapshot-mount.patch
+
+ -- Darik Horn <dajhorn@vanadac.com>  Thu, 05 May 2011 19:51:35 -0500
+
+zfs-linux (0.6.0.12.rc4-0ubuntu1) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Add Gentoo/Lunar/Redhat Init Scripts
+  * Prep zfs-0.6.0-rc4 tag
+
+  [ Darik Horn ]
+  * Use 0.6.0.12.rc4 as the unofficial version.
+  * Quilt refresh.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Thu, 05 May 2011 10:18:40 -0500
+
+zfs-linux (0.6.0.11-0ubuntu1) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Suppress 'vdev_metaslab_init' memory warning
+  * Fix 'zfs set volsize=N pool/dataset'
+  * Fully update inode when created
+  * Correct MAXUID
+
+  [ Gunnar Beutner ]
+  * Implemented NFS export_operations.
+
+  [ Alejandro R. Sedeño ]
+  * Add zpl_export.c to the list of targets.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Mon, 02 May 2011 19:07:36 -0500
+
+zfs-linux (0.6.0.10-0ubuntu1) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Fix zvol deadlock
+  * Conserve stack in dsl_scan_visitbp()
+  * Conserve stack in dsl_scan_visitbp()
+  * Conserve stack in dsl_scan_visit()
+
+  [ Darik Horn ]
+  * Use gethostid in the Linux convention.
+  * Use 0.6.0.10 as the unofficial version.
+  * Use substvars versions in the debian/control.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Wed, 27 Apr 2011 11:23:52 -0500
+
+zfs-linux (0.6.0.9-0ubuntu1) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Update zconfig.sh to use new zvol names
+  * Suppress 'zfs receive' memory warning
+  * Enforce ARC meta-data limits
+  * Fix spurious -EFAULT when setting I/O scheduler
+  * Fix 32-bit MAXOFFSET_T definition
+
+  [ Aniruddha Shankar ]
+  * Added required runlevel info for init on Debian
+
+  [ Gunnar Beutner ]
+  * Fixed a use-after-free bug in zfs_zget().
+
+  [ Darik Horn ]
+  * Use 0.6.0.9 as the unofficial version.
+  * Remove the gawk packaging dependency.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Sat, 23 Apr 2011 11:21:36 -0500
+
+zfs-linux (0.6.0.8-0ubuntu1) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Linux 2.6.29 compat, credentials
+  * Fix rebuildable RPMs for el6/ch5
+  * Autogen refresh for kernel-insert-inode-locked.m4
+  * Linux 2.6.39 compat, invalidate_inodes()
+  * Fix gcc compiler warning, dsl_pool_create()
+  * Fix gcc compiler warning, parse_option()
+  * Fix gcc configure warnings
+  * Set -Wno-unused-but-set-variable globally
+  * Add Gunnar Beutner to AUTHORS for his contributions
+  * Add parted and lsscsi dependencies to zfs-test
+
+  [ Richard Laager ]
+  * Fix a couple comments
+  * Correct man page section numbers for Linux
+  * Change /dev/dsk -> /dev in the man pages
+  * More and correct an example in zpool.8
+  * Use Linux disk names in zpool.8
+  * Linux has "partitions", not "slices"
+  * Remove a stray tab
+  * Improve some quoting consistency
+  * Improve the wording about hot spares
+  * Normalize the deferred destruction language
+  * Update the version in the zpool upgrade example
+  * Cleanup various Sun/Solaris-isms
+  * Support IEC base-2 prefixes
+
+  [ Ned Bass ]
+  * Use consistent indentation in mount-zfs.sh
+  * Align closing fi in mount-zfs.sh
+
+  [ Gunnar Beutner ]
+  * Added missing initialization for va.va_dentry in zfs_get_xattrdir.
+  * Truncate the xattr znode when updating existing attributes.
+
+  [ Darik Horn ]
+  * Refresh debian/patches.
+  * Use zfs-0.6.0.8 as the unofficial upstream version.
+  * Set a version on the spl-dkms dependency.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Wed, 20 Apr 2011 08:21:51 -0500
+
+zfs-linux (0.6.0.7-0ubuntu2) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Call d_instantiate before unlocking inode
+  * Add missing arcstats
+  * Add direct+indirect ARC reclaim
+  * Fix ASSERTION(!dsl_pool_sync_context(tx->tx_pool))
+  * Prep zfs-0.6.0-rc3 tag
+
+  [ Manuel Amador (Rudd-O) ]
+  * Added .gitignore for mount.zfs and zvol_id
+  * Permit both mountpoint=legacy and mountpoint=/ in initrd
+  * Update zfs.fedora init script
+
+  [ Darik Horn ]
+  * Upstream zfs-0.6.0-rc3 tag. Use 0.6.0.7 instead.
+  * Add a zfs-grub dependency to zfs-initramfs.
+  * Add a NEWS entry for the decomposition and rename.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Thu, 07 Apr 2011 13:51:23 -0500
+
+zfs-linux (0.6.0.6-0ubuntu2) unstable; urgency=low
+
+  * Partial autogen updates to fix PPA builds.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Thu, 07 Apr 2011 10:52:30 -0500
+
+zfs-linux (0.6.0.6-0ubuntu1) unstable; urgency=low
+
+  [ Fajar A. Nugraha ]
+  * Fixes to enable zvol symlink creation
+  * Spec file compat, %{datadir}
+
+  [ Brian Behlendorf ]
+  * Set cmd paths in udev rules using --prefix
+  * Fix inflated load average
+  * Fix libzpool cv_* build error
+  * Update CHAOS 5 Packaging
+  * Fix `make distclean` for `./configure --with-config=user
+
+  [ Ned Bass ]
+  * Call udevadm trigger more safely
+
+  [ Darik Horn ]
+  * Remove `make distclean` kludge.
+  * Ignore `zfs unmount -a` errors in the init script.
+  * Rename /etc/default/zfsload during upgrades.
+  * Disable dracut instead of reverting it.
+  * Move udev rules from /etc to /lib.
+  * Add ${shlibs:Depends} to each control stanza.
+  * Remove volume and swap handling from the init script.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Tue, 05 Apr 2011 22:08:06 -0500
+
+zfs-linux (0.6.0.5-1ubuntu7) unstable; urgency=low
+
+  * Force the dkms.conf file into the zfs-dkms package.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Thu, 31 Mar 2011 11:03:56 -0500
+
+zfs-linux (0.6.0.5-1ubuntu6) unstable; urgency=low
+
+  * Link /proc/mounts to /etc/mtab.
+  * Add the /etc/default/zfs import to the init script.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Wed, 30 Mar 2011 16:12:41 -0500
+
+zfs-linux (0.6.0.5-1ubuntu5) unstable; urgency=low
+
+  * Use /sbin/mount.zfs for the root mount in the initramfs.
+  * Handle the GRUB zfs-bootfs parameter in the initramfs.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Wed, 30 Mar 2011 12:22:12 -0500
+
+zfs-linux (0.6.0.5-1ubuntu2) unstable; urgency=low
+
+  * Rename the zfs package to zfsutils.
+  * Rename the zfs-lib package to libzfs0.
+  * Decompose the zfs-lib package.
+  * Restrict the package architecture to linux-any.
+  * Remove the KQ init script that was imported from zfs-linux/lzfs.
+  * Import the zfsutils init script from Debian kFreeBSD.
+  * Check zvols for Linux swap areas instead of FreeBSD swap areas.
+  * Replace zfs by zfsutils in the debian/control file.
+  * Add libzfs-dev to the debian/control file.
+  * Change usr/lib/include to usr/include in the libzfs-dev.install file.
+  * Add a zfs-lib replacement to each constituent library.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Tue, 29 Mar 2011 09:17:38 -0500
+
+zfs-linux (0.6.0.5-0ubuntu2) unstable; urgency=low
+
+  * Include /sbin/mount.zfs in the zfs package.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Thu, 24 Mar 2011 12:37:40 -0500
+
+zfs-linux (0.6.0.5-0ubuntu1) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Check for trailing '/' in mount.zfs
+  * Don't set I/O Scheduler for Partitions
+  * Always allow '-o remount,ro'
+  * Strip 'zfsutil,remount' from /etc/mtab
+  * Register .sync_fs handler
+  * Register .remount_fs handler
+  * Add init scripts
+  * Fix getcwd() warning
+  * Fix 'LDFLAGS=-Wl,--as-needed' build error
+  * Use KM_PUSHPAGE instead of KM_SLEEP
+  * Fix evict() deadlock
+  * Linux compat, umount2(2) flags
+  * Linux 2.6.27 compat, blk_queue_stackable()
+  * Linux 2.6.28 compat, insert_inode_locked()
+  * Linux 2.6.29 compat, credentials
+  * Linux 2.6.29 compat, .freeze_fs/.unfreeze_fs
+
+  [ Darik Horn ]
+  * Full upstream merge. Use zfs-0.6.0.5 as the unofficial upstream version.
+  * Revert the dracut commit in debian/patches.
+  * Revert the init script commit in debian/patches.
+  * Quilt refresh.
+  * Properly strip the bootfs= and rpool= kernel command line parameters.
+  * Remove the whack-bang and execute bit from the initramfs boot script.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Tue, 22 Mar 2011 23:07:49 -0500
+
+zfs-linux (0.6.0.4.rc2-0ubuntu6) unstable; urgency=low
+
+  * Trivial typo correction in the debian/copyright file.
+  * Remove the init-top/hostname script and force BUSYBOX=y instead.
+  * Correct typos in the debian/debuild-ppa.sh helper.
+  * Add a debian/source/options file that disable the
+    implied --single-debian-patch build option.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Sun, 20 Mar 2011 19:11:12 -0500
+
+zfs-linux (0.6.0.4.rc2-0ubuntu5) unstable; urgency=low
+
+  * Add the debuild-ppa.sh script for Launchpad PPA build convenience.
+  * Add fix-getcwd-warning.patch from behlendorf/master.
+  * Add fix-gentoo-ldflags.patch from behlendorf/master.
+  * Add the pkg-zfs repository to the debian/copyright file.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Sun, 20 Mar 2011 15:27:49 -0500
+
+zfs-linux (0.6.0.4.rc2-0ubuntu4) unstable; urgency=low
+
+  * Add behlendorf/dracut patch for better dismount handling at shutdown.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Wed, 16 Mar 2011 09:16:00 -0500
+
+zfs-linux (0.6.0.4.rc2-0ubuntu3) unstable; urgency=low
+
+  * Add patches from behlendorf/master:
+    * check-for-trailing-slash-in-mount.patch
+    * do-not-set-io-scheduler-for-partitions.patch
+  * Add gawk dependency to the zfs-initramfs package.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Sun, 13 Mar 2011 21:32:32 -0500
+
+zfs-linux (0.6.0.4.rc2-0ubuntu2) unstable; urgency=low
+
+  * Initial zfs-initramfs packaging for root filesystem support.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Fri, 11 Mar 2011 15:39:37 -0600
+
+zfs-linux (0.6.0.4.rc2-0ubuntu1) unstable; urgency=low
+
+   * Upstream spl-0.6.0-rc2 release.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Thu, 10 Mar 2011 09:35:43 -0600
+
+zfs-linux (0.6.0.3.git-0ubuntu1) unstable; urgency=low
+
+  * Revert the '+' in the upstream version because it is not recognized by DKMS.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Wed, 09 Mar 2011 12:24:41 -0600
+
+zfs-linux (0.6.0.3+git-0ubuntu2) unstable; urgency=low
+
+  * Change spl-dkms to a pre-dependency in the control file.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Wed, 09 Mar 2011 10:54:07 -0600
+
+zfs-linux (0.6.0.3+git-0ubuntu1) unstable; urgency=low
+
+  * Begin using the +git upstream naming convention.
+  * Merge the behlendorf/mount and behlendorf/master branches.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Wed, 09 Mar 2011 10:09:24 -0600
+
+zfs-linux (0.6.0.2-0ubuntu1) unstable; urgency=low
+
+  * Merge the behlendorf/master branch for the xvattr changes
+    and tag it as 0.6.0.2 upstream.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Fri, 04 Mar 2011 19:24:42 -0600
+
+zfs-linux (0.6.0.1rc.1-0ubuntu6) unstable; urgency=low
+
+  * Check for a Debian host in PRE_BUILD and configure for split headers.
+    See https://github.com/behlendorf/spl/issues/closed/#issue/10
+
+ -- Darik Horn <dajhorn@vanadac.com>  Sun, 27 Feb 2011 17:51:17 -0600
+
+zfs-linux (0.6.0.1rc.1-0ubuntu5) unstable; urgency=low
+
+  * Remove the build dependency on linux-headers because it is unnecessary
+    for Ubuntu and prevents building on Debian Squeeze and Debian Sid.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Sun, 27 Feb 2011 13:20:03 -0600
+
+zfs-linux (0.6.0.1rc.1-0ubuntu4) unstable; urgency=low
+
+  * Add version numbers to the dkms dependencies.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Sat, 26 Feb 2011 01:13:40 -0600
+
+zfs-linux (0.6.0.1rc.1-0ubuntu3) unstable; urgency=low
+
+  * Add fix-set-block-scheduler-warnings.patch.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Fri, 25 Feb 2011 20:59:26 -0600
+
+zfs-linux (0.6.0.1rc.1-0ubuntu2) unstable; urgency=low
+
+  * Add udev-zvol.patch for udev to create zvol links.
+    (Commit: 4c0d8e50b99b4f3b4a9b7bc67ac7fc4e406f5755)
+
+ -- Darik Horn <dajhorn@vanadac.com>  Fri, 25 Feb 2011 15:20:41 -0600
+
+zfs-linux (0.6.0.1rc.1-0ubuntu1) unstable; urgency=low
+
+  * Merge behlendorf/linux-compat for Linux 2.6.38 compatibility.
+  * Add /etc/default/zfsload for the init script.
+  * Add dist-blkdev_compat.patch so that the new block device
+    compatibility header is included by the dist rules.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Thu, 24 Feb 2011 10:30:13 -0600
+
+zfs-linux (0.6.0.1rc-1~lucid.4) lucid; urgency=low
+
+  * Force all zfsload returns to 0.
+  * Initial master branch for git-buildpackage.
+  * Update Vcs-Git and Vcs-Browser fields in the control file.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Tue, 22 Feb 2011 11:23:31 -0600
+
+zfs-linux (0.6.0.1rc-1~lucid.3) lucid; urgency=low
+
+  * Move the zfsload init script from the zfs-dkms package
+    to the zfs package.
+  * Disable non-zero returns in the zfsload script because
+    `zfs umount -a` is unreliable and init errors cause dpkg
+    to block package updates and removals.
+  * Create zfs.examples for dh_installexamples and change the
+    install manifest for etc/zfs/*.example accordingly.
+  * Split zfs into zfs-lib to satisfy the dpkg-shlibdeps warnings.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Mon, 21 Feb 2011 11:27:11 -0600
+
+zfs-linux (0.6.0.1rc-1~lucid.2) lucid; urgency=low
+
+  * Reduce the dpkg scripts to #DEBHELPER# because dh_dkms
+    is automatically and correctly filling template.
+  * Set a versioned debhelper dependency to satisfy the
+    lintian warning.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Mon, 21 Feb 2011 10:27:29 -0600
+
+zfs-linux (0.6.0.1rc-1~lucid.1) lucid; urgency=low
+
+  * New upstream zfs-0.6.0-rc1.tar.gz release.
+  * Kludge the "rc1" version for the packaging convenience.
+  * Move the zfsload script to this package.
+  * Supercede the lzfs-dkms package.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Fri, 18 Feb 2011 19:46:36 -0600
+
+zfs-linux (0.5.2-1~lucid.6) lucid; urgency=low
+
+  * Do uupdate on kqzfs_0.5.2 tag.
+  * Remove disable-check_stack_overflow patch.
+  * Add kernel-bio-failfast.patch for `make distdir`.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Fri, 18 Feb 2011 12:52:07 -0600
+
+zfs-linux (0.5.1-1~lucid.5) lucid; urgency=low
+
+  * Initial DKMS packaging for Debian and Ubuntu.
+
+ -- Darik Horn <dajhorn@vanadac.com>  Wed, 16 Feb 2011 12:26:49 -0600
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..603eccd
--- /dev/null
@@ -0,0 +1,137 @@
+Source: zfs-linux
+Section: kernel
+Priority: extra
+Maintainer: Darik Horn <dajhorn@vanadac.com>
+Build-Depends: autotools-dev, debhelper (>= 7.4), dkms (>> 2.1.1.2-5ubuntu1), uuid-dev, zlib1g-dev
+Standards-Version: 3.8.4
+Vcs-Git: git://github.com/dajhorn/pkg-zfs.git
+Vcs-Browser: http://github.com/dajhorn/pkg-zfs
+
+Package: libzavl1
+Section: libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: libavl1
+Replaces: libavl0, zfs-lib
+Description: OpenSolaris AVL tree manipulation library for Linux
+ Adelson-Velskii Landis balanced binary tree manipulation library.
+
+Package: libefi1
+Section: libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libefi0, zfs-lib
+Description: OpenSolaris EFI library for Linux
+ Extensible Firmware Interface library for GUID disk partitioning.
+
+Package: libnvpair1
+Section: libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libnvpair0, zfs-lib
+Description: OpenSolaris name-value library for Linux
+ This library provides routines for packing and unpacking nv pairs for
+ transporting data across process boundaries, transporting between
+ kernel and userland, and possibly saving onto disk files.
+
+Package: libshare1
+Section: libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libshare0
+Description: Solaris network sharing library for Linux
+ This library provides NFS and SMB service integration for
+ ZFS filesystems.
+
+Package: libspl1
+Section: libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: spl-dev
+Replaces: libspl0, zfs-lib
+Description: Solaris Portability Layer library for Linux
+ The Solaris Porting Layer (SPL) library provides APIs that make it
+ possible to run Solaris user code in a Linux environment with
+ relatively minimal modification.
+
+Package: libunicode1
+Section: libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libunicode0, zfs-lib
+Description: OpenSolaris unicode library for Linux
+ This library provides UTF-8 text preparation functions and
+ conversion functions for UTF-8, UTF-16, and UTF-32.
+
+Package: libuutil1
+Section: libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libuutil0, zfs-lib
+Description: OpenSolaris userland utility library for Linux
+ Solaris glue functions for ZFS.
+
+Package: libzfs-dev
+Section: libdevel
+Architecture: linux-any
+Depends: ${misc:Depends}, libzfs1 (= ${binary:Version})
+Provides: libnvpair-dev, libuutil-dev
+Replaces: zfs-lib
+Description: Native ZFS filesystem development files for Linux
+ Header files and static libraries for compiling software
+ against libzfs.
+
+Package: libzfs1
+Section: libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libzfs0, zfs-lib
+Description: Native ZFS filesystem library for Linux
+ The zfs management library.
+
+Package: libzpool1
+Section: libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libzpool0, zfs-lib
+Description: Native ZFS pool library for Linux
+ The zpool management library.
+
+Package: zfs-dkms
+Section: kernel
+Architecture: linux-any
+Depends: ${misc:Depends}, dkms (>> 2.1.1.2-5ubuntu1), spl-dkms (>= ${source:Upstream-Version})
+Replaces: lzfs, lzfs-dkms
+Provides: lzfs, lzfs-dkms
+Conflicts: lzfs, lzfs-dkms
+Description: Native ZFS filesystem kernel modules for Linux
+ An advanced integrated volume manager and filesystem.
+ Includes the SPA, DMU, ZVOL, and ZPL components of ZFS.
+
+Package: zfs-dracut
+Section: kernel
+Architecture: linux-any
+Depends: ${misc:Depends}, dracut, zfsutils
+Description: Native ZFS root filesystem capabilities for Linux
+ This package adds ZFS to the system initramfs with a hook
+ for the dracut infrastructure.
+
+Package: zfs-initramfs
+Section: kernel
+Architecture: linux-any
+Depends: ${misc:Depends}, mountall (>= 2.18), zfsutils, zfs-grub
+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
+Section: admin
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: zfs-dkms
+Suggests: nfs-kernel-server, zfs-initramfs
+Conflicts: zfs, zfs-fuse
+Replaces: zfs
+Description: Native ZFS management utilities for Linux
+ This package provides the zpool and zfs commands that are used to
+ manage ZFS filesystems.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..4faf361
--- /dev/null
@@ -0,0 +1,61 @@
+Upstream Author(s):
+
+    Brian Behlendorf <behlendorf1@llnl.gov>,
+    Herb Wartens <wartens2@llnl.gov>,
+    Jim Garlick <garlick@llnl.gov>,
+    Ricardo M. Correia <Ricardo.M.Correia@sun.com>
+    KQ Infotech <zfs@kqinfotech.com>
+
+
+Copyright:
+
+    The majority of the code in the ZFS on Linux port comes from OpenSolaris
+    which has been released under the terms of the CDDL open source license.
+    This includes the core ZFS code, libavl, libnvpair, libefi, libunicode,
+    and libutil.  The original OpenSolaris source can be downloaded from:
+
+    http://dlc.sun.com/osol/on/downloads/b121/on-src.tar.bz2
+
+    Files which do not originate from OpenSolaris are noted in the file header
+    and attributed properly.  These exceptions include, but are not limited
+    to, the vdev_disk.c and zvol.c implementation which are licensed under
+    the CDDL.
+
+    The zpios test code is originally derived from the Lustre pios test code
+    which is licenced under the GPLv2.  As such the heaviliy modified zpios
+    kernel test code also remains licensed under the GPLv2.
+
+    The latest stable and development versions of this port can be downloaded
+    from the official ZFS on Linux site located at:
+
+    http://github.com/behlendorf/zfs/
+
+    This ZFS on Linux port was produced at the Lawrence Livermore National
+    Laboratory (LLNL) under Contract No. DE-AC52-07NA27344 (Contract 44)
+    between the U.S. Department of Energy (DOE) and Lawrence Livermore
+    National Security, LLC (LLNS) for the operation of LLNL.  It has been
+    approved for release under LLNL-CODE-403049.
+
+    Unless otherwise noted, all files in this distribution are released
+    under the Common Development and Distribution License (CDDL).
+    Exceptions are noted within the associated source files.  See the file
+    OPENSOLARIS.LICENSE for more information.
+
+
+License:
+
+    Unless otherwise noted, all files in this distribution are released
+    under the Common Development and Distribution License (CDDL).
+    Exceptions are noted within the associated source files.  See the file
+    OPENSOLARIS.LICENSE for more information.
+
+
+The Debian packaging is:
+
+    Copyright 2011 Darik Horn <dajhorn@vanadac.com>
+    Available at git://github.com/dajhorn/pkg-zfs.git
+
+    Copyright (c) 2010 Knowledge Quest Infotech Pvt. Ltd. 
+    Produced at Knowledge Quest Infotech Pvt. Ltd. 
+    Written by: Knowledge Quest Infotech Pvt. Ltd. <zfs@kqinfotech.com>
+    Available at git://github.com/zfs-linux/zfs.git
diff --git a/debian/debuild-ppa.sh b/debian/debuild-ppa.sh
new file mode 100755 (executable)
index 0000000..47c0123
--- /dev/null
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# Launchpad PPA build helper.
+#
+
+PPA_USER=${PPA_USER:-$(whoami)}
+PPA_NAME='zfs'
+PPA_DISTRIBUTION_LIST='lucid maverick natty oneiric'
+PPA_GENCHANGES='-sa'
+
+if [ ! -d debian/ ]
+then
+       echo 'Error: The debian/ directory is not in the current working path.'
+       exit 1
+fi
+
+for ii in $PPA_DISTRIBUTION_LIST
+do
+       # Change the first line of the debian/changelog file
+       # from: MyPackage (1.2.3-4) unstable; urgency=low
+       # to: MyPackage (1.2.3-4~distname) distname; urgency=low
+       debchange --local="~$ii" --distribution="$ii" dummy
+       sed -i -e '2,8d' debian/changelog
+
+       debuild -S "$PPA_GENCHANGES"
+       git checkout debian/changelog
+
+       # Only do a full upload on the first build.
+       PPA_GENCHANGES='-sd'
+done
diff --git a/debian/libefi1.docs b/debian/libefi1.docs
new file mode 100644 (file)
index 0000000..bfe5e7f
--- /dev/null
@@ -0,0 +1,3 @@
+COPYRIGHT
+DISCLAIMER
+OPENSOLARIS.LICENSE
diff --git a/debian/libefi1.install b/debian/libefi1.install
new file mode 100644 (file)
index 0000000..9a68fd1
--- /dev/null
@@ -0,0 +1 @@
+lib/libefi.so*
diff --git a/debian/libnvpair1.docs b/debian/libnvpair1.docs
new file mode 100644 (file)
index 0000000..bfe5e7f
--- /dev/null
@@ -0,0 +1,3 @@
+COPYRIGHT
+DISCLAIMER
+OPENSOLARIS.LICENSE
diff --git a/debian/libnvpair1.install b/debian/libnvpair1.install
new file mode 100644 (file)
index 0000000..51def61
--- /dev/null
@@ -0,0 +1 @@
+lib/libnvpair.so*
diff --git a/debian/libshare1.install b/debian/libshare1.install
new file mode 100644 (file)
index 0000000..3389f69
--- /dev/null
@@ -0,0 +1 @@
+lib/libshare.so*
diff --git a/debian/libspl1.docs b/debian/libspl1.docs
new file mode 100644 (file)
index 0000000..bfe5e7f
--- /dev/null
@@ -0,0 +1,3 @@
+COPYRIGHT
+DISCLAIMER
+OPENSOLARIS.LICENSE
diff --git a/debian/libspl1.install b/debian/libspl1.install
new file mode 100644 (file)
index 0000000..de28300
--- /dev/null
@@ -0,0 +1 @@
+lib/libspl.so*
diff --git a/debian/libunicode1.docs b/debian/libunicode1.docs
new file mode 100644 (file)
index 0000000..bfe5e7f
--- /dev/null
@@ -0,0 +1,3 @@
+COPYRIGHT
+DISCLAIMER
+OPENSOLARIS.LICENSE
diff --git a/debian/libunicode1.install b/debian/libunicode1.install
new file mode 100644 (file)
index 0000000..5e68e41
--- /dev/null
@@ -0,0 +1 @@
+lib/libunicode.so*
diff --git a/debian/libuutil1.docs b/debian/libuutil1.docs
new file mode 100644 (file)
index 0000000..bfe5e7f
--- /dev/null
@@ -0,0 +1,3 @@
+COPYRIGHT
+DISCLAIMER
+OPENSOLARIS.LICENSE
diff --git a/debian/libuutil1.install b/debian/libuutil1.install
new file mode 100644 (file)
index 0000000..92eb1a9
--- /dev/null
@@ -0,0 +1 @@
+lib/libuutil.so*
diff --git a/debian/libzavl1.docs b/debian/libzavl1.docs
new file mode 100644 (file)
index 0000000..bfe5e7f
--- /dev/null
@@ -0,0 +1,3 @@
+COPYRIGHT
+DISCLAIMER
+OPENSOLARIS.LICENSE
diff --git a/debian/libzavl1.install b/debian/libzavl1.install
new file mode 100644 (file)
index 0000000..6038628
--- /dev/null
@@ -0,0 +1 @@
+lib/libavl.so*
diff --git a/debian/libzfs-dev.docs b/debian/libzfs-dev.docs
new file mode 100644 (file)
index 0000000..bfe5e7f
--- /dev/null
@@ -0,0 +1,3 @@
+COPYRIGHT
+DISCLAIMER
+OPENSOLARIS.LICENSE
diff --git a/debian/libzfs-dev.install b/debian/libzfs-dev.install
new file mode 100644 (file)
index 0000000..424e193
--- /dev/null
@@ -0,0 +1,3 @@
+lib/*.a
+lib/*.la
+usr/include
diff --git a/debian/libzfs1.docs b/debian/libzfs1.docs
new file mode 100644 (file)
index 0000000..bfe5e7f
--- /dev/null
@@ -0,0 +1,3 @@
+COPYRIGHT
+DISCLAIMER
+OPENSOLARIS.LICENSE
diff --git a/debian/libzfs1.install b/debian/libzfs1.install
new file mode 100644 (file)
index 0000000..ec34960
--- /dev/null
@@ -0,0 +1 @@
+lib/libzfs.so*
diff --git a/debian/libzpool1.docs b/debian/libzpool1.docs
new file mode 100644 (file)
index 0000000..bfe5e7f
--- /dev/null
@@ -0,0 +1,3 @@
+COPYRIGHT
+DISCLAIMER
+OPENSOLARIS.LICENSE
diff --git a/debian/libzpool1.install b/debian/libzpool1.install
new file mode 100644 (file)
index 0000000..97d56d2
--- /dev/null
@@ -0,0 +1 @@
+lib/libzpool.so*
diff --git a/debian/patches/disable-dist-init.patch b/debian/patches/disable-dist-init.patch
new file mode 100644 (file)
index 0000000..a912ddc
--- /dev/null
@@ -0,0 +1,53 @@
+Index: b/etc/Makefile.am
+===================================================================
+--- a/etc/Makefile.am
++++ b/etc/Makefile.am
+@@ -1 +1 @@
+-SUBDIRS = init.d udev zfs
++SUBDIRS = udev zfs
+Index: b/etc/Makefile.in
+===================================================================
+--- a/etc/Makefile.in
++++ b/etc/Makefile.in
+@@ -301,7 +301,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = init.d udev zfs
++SUBDIRS = udev zfs
+ all: all-recursive
+ .SUFFIXES:
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -60,7 +60,6 @@
+       etc/Makefile
+       etc/udev/Makefile
+       etc/udev/rules.d/Makefile
+-      etc/init.d/Makefile
+       etc/zfs/Makefile
+       man/Makefile
+       man/man8/Makefile
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
+@@ -20555,7 +20555,7 @@
+ $as_echo "$enable_debug" >&6; }
+-ac_config_files="$ac_config_files Makefile dracut/Makefile dracut/90zfs/Makefile etc/Makefile etc/udev/Makefile etc/udev/rules.d/Makefile etc/init.d/Makefile etc/zfs/Makefile man/Makefile man/man8/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/sysevent/Makefile lib/libspl/include/sys/dktp/Makefile lib/libspl/include/util/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile lib/libshare/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile cmd/mount_zfs/Makefile cmd/zpool_layout/Makefile cmd/zvol_id/Makefile cmd/zpool_id/Makefile cmd/sas_switch_id/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile include/Makefile include/linux/Makefile include/sys/Makefile include/sys/fs/Makefile include/sys/fm/Makefile include/sys/fm/fs/Makefile scripts/Makefile scripts/zpios-profile/Makefile scripts/zpios-test/Makefile scripts/zpool-config/Makefile scripts/zpool-layout/Makefile scripts/common.sh zfs.spec zfs-modules.spec zfs-script-config.sh"
++ac_config_files="$ac_config_files Makefile dracut/Makefile dracut/90zfs/Makefile etc/Makefile etc/udev/Makefile etc/udev/rules.d/Makefile etc/zfs/Makefile man/Makefile man/man8/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/sysevent/Makefile lib/libspl/include/sys/dktp/Makefile lib/libspl/include/util/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile lib/libshare/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile cmd/mount_zfs/Makefile cmd/zpool_layout/Makefile cmd/zvol_id/Makefile cmd/zpool_id/Makefile cmd/sas_switch_id/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile include/Makefile include/linux/Makefile include/sys/Makefile include/sys/fs/Makefile include/sys/fm/Makefile include/sys/fm/fs/Makefile scripts/Makefile scripts/zpios-profile/Makefile scripts/zpios-test/Makefile scripts/zpool-config/Makefile scripts/zpool-layout/Makefile scripts/common.sh zfs.spec zfs-modules.spec zfs-script-config.sh"
+ cat >confcache <<\_ACEOF
+@@ -21477,7 +21477,6 @@
+     "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
+     "etc/udev/Makefile") CONFIG_FILES="$CONFIG_FILES etc/udev/Makefile" ;;
+     "etc/udev/rules.d/Makefile") CONFIG_FILES="$CONFIG_FILES etc/udev/rules.d/Makefile" ;;
+-    "etc/init.d/Makefile") CONFIG_FILES="$CONFIG_FILES etc/init.d/Makefile" ;;
+     "etc/zfs/Makefile") CONFIG_FILES="$CONFIG_FILES etc/zfs/Makefile" ;;
+     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+     "man/man8/Makefile") CONFIG_FILES="$CONFIG_FILES man/man8/Makefile" ;;
diff --git a/debian/patches/disable-dist-scripts.patch b/debian/patches/disable-dist-scripts.patch
new file mode 100644 (file)
index 0000000..4b9dc21
--- /dev/null
@@ -0,0 +1,58 @@
+Index: b/scripts/Makefile.am
+===================================================================
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = zpool-config zpool-layout zpios-test zpios-profile
++SUBDIRS = zpool-config zpios-test zpios-profile
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
+ dist_pkglibexec_SCRIPTS = \
+Index: b/scripts/Makefile.in
+===================================================================
+--- a/scripts/Makefile.in
++++ b/scripts/Makefile.in
+@@ -326,7 +326,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = zpool-config zpool-layout zpios-test zpios-profile
++SUBDIRS = zpool-config zpios-test zpios-profile
+ dist_pkglibexec_SCRIPTS = \
+       $(top_builddir)/scripts/common.sh \
+       $(top_srcdir)/scripts/zconfig.sh \
+Index: b/Makefile.am
+===================================================================
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@
+ include $(top_srcdir)/config/tgz.am
+ if CONFIG_USER
+-USER_DIR = dracut etc man scripts lib cmd
++USER_DIR = dracut etc man lib cmd
+ endif
+ if CONFIG_KERNEL
+ KERNEL_DIR = module
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -129,7 +129,7 @@
+       distdir dist dist-all distcheck
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = dracut etc man scripts lib cmd module include
++DIST_SUBDIRS = dracut etc man lib cmd module include
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -333,7 +333,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-@CONFIG_USER_TRUE@USER_DIR = dracut etc man scripts lib cmd
++@CONFIG_USER_TRUE@USER_DIR = dracut etc man lib cmd
+ @CONFIG_KERNEL_TRUE@KERNEL_DIR = module
+ SUBDIRS = $(USER_DIR) $(KERNEL_DIR) include
+ AUTOMAKE_OPTIONS = foreign
diff --git a/debian/patches/lintian-COPYING.patch b/debian/patches/lintian-COPYING.patch
new file mode 100644 (file)
index 0000000..1cb3907
--- /dev/null
@@ -0,0 +1,13 @@
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -47,7 +47,7 @@
+       $(top_srcdir)/module/unicode/Makefile.in \
+       $(top_srcdir)/module/zcommon/Makefile.in \
+       $(top_srcdir)/module/zfs/Makefile.in \
+-      $(top_srcdir)/module/zpios/Makefile.in AUTHORS COPYING \
++      $(top_srcdir)/module/zpios/Makefile.in AUTHORS \
+       ChangeLog config/config.guess config/config.sub config/depcomp \
+       config/install-sh config/ltmain.sh config/missing
+ subdir = .
diff --git a/debian/patches/lintian-ltmain.patch b/debian/patches/lintian-ltmain.patch
new file mode 100644 (file)
index 0000000..bd46cbe
--- /dev/null
@@ -0,0 +1,10 @@
+Index: b/config/ltmain.sh
+===================================================================
+--- a/config/ltmain.sh
++++ b/config/ltmain.sh
+@@ -1,3 +1,5 @@
++#!/bin/sh
++
+ # Generated from ltmain.m4sh.
+ # ltmain.sh (GNU libtool) 2.2.6b
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..588f7fa
--- /dev/null
@@ -0,0 +1,5 @@
+volatile-version.patch
+#disable-dist-init.patch
+disable-dist-scripts.patch
+lintian-COPYING.patch
+lintian-ltmain.patch
diff --git a/debian/patches/volatile-version.patch b/debian/patches/volatile-version.patch
new file mode 100644 (file)
index 0000000..60f5a1c
--- /dev/null
@@ -0,0 +1,13 @@
+Index: b/META
+===================================================================
+--- a/META
++++ b/META
+@@ -1,7 +1,7 @@
+ Meta:         1
+ Name:         zfs
+ Branch:       1.0
+-Version:      0.6.0
++Version:      0.6.0.26
+ Release:      rc5
+ Release-Tags: relext
+ License:      CDDL
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..a58a3ad
--- /dev/null
@@ -0,0 +1,65 @@
+#!/usr/bin/make -f
+
+NAME := $(shell awk '/^Name:/{print $$2}' META)
+VERSION := $(shell awk '/^Version:/{print $$2}' META)
+
+%:
+       dh $@
+
+override_dh_auto_configure:
+       # Build the userland, but don't build the kernel modules.
+       ./configure \
+         --prefix=/ \
+         --bindir=/lib/udev \
+         --libexecdir=/usr/libexec \
+         --libdir=/lib \
+         --includedir=/usr/include \
+         --datarootdir=/usr/share \
+         --with-config=user \
+       
+override_dh_auto_test:
+       # `make check` cannot run in an unprivileged build environment.
+
+override_dh_auto_install:
+       # Install the utilities.
+       make install DESTDIR='$(CURDIR)/debian/tmp'
+
+       # Get a bare copy of the source code.
+       # This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree.
+       make distdir
+
+       # @FIXME: Create a distdir_modules rule.
+       #
+       # Scripts distribution is disabled because Lintian complains about
+       # having them in the DKMS sources. Stub the automake files to prevent
+       # a spurious configure error until the distdir rule can be improved.
+       mkdir -p \
+         '$(CURDIR)/$(NAME)-$(VERSION)/scripts' \
+         '$(CURDIR)/$(NAME)-$(VERSION)/scripts/zpios-profile' \
+         '$(CURDIR)/$(NAME)-$(VERSION)/scripts/zpios-test' \
+         '$(CURDIR)/$(NAME)-$(VERSION)/scripts/zpool-config' \
+         '$(CURDIR)/$(NAME)-$(VERSION)/scripts/zpool-layout'
+       touch \
+         '$(CURDIR)/$(NAME)-$(VERSION)/scripts/common.sh.in' \
+         '$(CURDIR)/$(NAME)-$(VERSION)/scripts/Makefile.in' \
+         '$(CURDIR)/$(NAME)-$(VERSION)/scripts/zpios-profile/Makefile.in' \
+         '$(CURDIR)/$(NAME)-$(VERSION)/scripts/zpios-test/Makefile.in' \
+         '$(CURDIR)/$(NAME)-$(VERSION)/scripts/zpool-config/Makefile.in' \
+         '$(CURDIR)/$(NAME)-$(VERSION)/scripts/zpool-layout/Makefile.in'
+
+       # This shunt allows DKMS to delete header files that are peculiar
+       # to each module instance through the POST_REMOVE directive in the
+       # dkms.conf file.
+       echo '#!/bin/sh'  >'$(CURDIR)/$(NAME)-$(VERSION)/rm'
+       echo 'rm "$$@"'  >>'$(CURDIR)/$(NAME)-$(VERSION)/rm'
+       chmod 755 '$(CURDIR)/$(NAME)-$(VERSION)/rm'
+
+       # Install the DKMS source.
+       mkdir -p '$(CURDIR)/debian/tmp/usr/src/'
+       mv '$(CURDIR)/$(NAME)-$(VERSION)' '$(CURDIR)/debian/tmp/usr/src/'
+
+       # Install the dkms.conf file.
+       dh_dkms -V $(VERSION)
+
+       # Install the init.d file.
+       dh_installinit --name=zfs
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644 (file)
index 0000000..707e48b
--- /dev/null
@@ -0,0 +1 @@
+extend-diff-ignore='.*'
diff --git a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/conf-hooks.d/zfs b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/conf-hooks.d/zfs
new file mode 100644 (file)
index 0000000..29950ca
--- /dev/null
@@ -0,0 +1,2 @@
+# Force the inclusion of Busybox in the initramfs.
+BUSYBOX=y
diff --git a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zfs b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zfs
new file mode 100755 (executable)
index 0000000..3772090
--- /dev/null
@@ -0,0 +1,88 @@
+#!/bin/sh
+#
+# Add ZFS filesystem capabilities to an initrd through update-initramfs.
+#
+
+
+# This module depends on these initramfs-tools modules.
+PREREQ="udev"
+# ZFS on Linux uses udev for device node creation.
+PREREQ_UDEV_RULES="60-zpool.rules 60-zvol.rules"
+
+# These prerequisites are provided by the zfs package. The zdb utility is not
+# strictly required, but it can be useful at the initramfs recovery prompt.
+COPY_EXEC_LIST=" \
+  /lib/udev/zvol_id \
+  /lib/udev/zpool_layout \
+  /lib/udev/zpool_id \
+  /sbin/zdb \
+  /sbin/zpool \
+  /sbin/zfs \
+  /sbin/mount.zfs \
+  "
+
+# These prerequisites are provides by other packages.
+COPY_EXEC_LIST="$COPY_EXEC_LIST /bin/hostname"
+
+# Explicitly specify all modules because dependency resolution is unreliable here.
+MANUAL_ADD_MODULES_LIST="zlib_deflate spl zavl zcommon znvpair zunicode zfs"
+
+
+case $1 in
+prereqs)
+       echo "$PREREQ"
+       exit 0
+       ;;
+esac
+
+for ii in $COPY_EXEC_LIST
+do
+       [ -x "$ii" ] || exit 0
+done
+
+. /usr/share/initramfs-tools/hook-functions
+
+mkdir -p "$DESTDIR/etc/"
+mkdir -p "$DESTDIR/lib/udev/rules.d/"
+
+for ii in $PREREQ_UDEV_RULES
+do
+       if [ -e "/etc/udev/rules.d/$ii" ]
+       then
+               cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
+       elif [ -e "/lib/udev/rules.d/$ii" ]
+       then
+               cp -p "/lib/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
+       else
+               echo "Error: Missing udev rule: $ii"
+               echo "       This file must be in the /etc/udev/rules.d or /lib/udev/rules.d directory."
+               exit 1
+       fi
+done
+
+for ii in $COPY_EXEC_LIST
+do
+       copy_exec "$ii"
+done
+
+for ii in $MANUAL_ADD_MODULES_LIST
+do
+       manual_add_modules "$ii"
+done
+
+if [ -f "/etc/hostname" ]
+then
+       cp -p "/etc/hostname" "$DESTDIR/etc/"
+else
+       hostname >"$DESTDIR/etc/hostname"
+fi
+
+# The spl package ensures that the /etc/hostid file exists.
+# NB: Commentary in the spl.postinst script.
+cp -p "/etc/hostid" "$DESTDIR/etc/hostid"
+
+if [ -e "/etc/zfs/" ]
+then
+       cp -a "/etc/zfs/" "$DESTDIR/etc/"
+fi
diff --git a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/scripts/zfs b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/scripts/zfs
new file mode 100644 (file)
index 0000000..f9cb473
--- /dev/null
@@ -0,0 +1,126 @@
+# ZFS boot stub for initramfs-tools.
+#
+# In the initramfs environment, the /init script sources this stub to
+# override the default functions in the /scripts/local script.
+#
+# Enable this by passing boot=zfs on the kernel command line.
+#
+
+
+pre_mountroot()
+{
+       [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-top"
+       run_scripts /scripts/local-top
+       [ "$quiet" != "y" ] && log_end_msg
+}
+
+
+mountroot()
+{
+       pre_mountroot
+
+       [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-premount"
+       run_scripts /scripts/local-premount
+       [ "$quiet" != "y" ] && log_end_msg
+
+       # Wait for all of the /dev/{hd,sd}[a-z] device nodes to appear.
+       wait_for_udev
+
+       # Check the kernel command line for overrides.
+       ZFS_RPOOL="${rpool#rpool=}"
+       ZFS_BOOTFS="${bootfs#bootfs=}"
+
+       if [ -z "$ZFS_RPOOL" ]
+       then
+               # Check for the `-B zfs-bootfs=%s/%u,...` kind of parameter.
+               #
+               # The ${zfs-bootfs} variable is set at the kernel commmand
+               # line, usually by GRUB, but it cannot be referenced here
+               # directly because bourne variable names cannot contain a
+               # hyphen.
+               #
+               # Reassign the variable by dumping the environment and
+               # stripping the zfs-bootfs= prefix.  Let the shell handle
+               # quoting through the eval command.
+               eval ZFS_RPOOL=$(set | sed -n -e 's,^zfs-bootfs=,,p')
+
+               # Only the pool name is relevant because the ZFS filesystem on Linux is
+               # extrinsic and the userland cannot resolve a ZFS object number.
+               #
+               # Strip everything after the first slash character.
+               ZFS_RPOOL=$(echo "$ZFS_RPOOL" | sed -e 's,/.*,,')
+       fi
+
+       # Use "rpool" as the default, like on most Solaris systems.
+       [ -z "$ZFS_RPOOL" ] && ZFS_RPOOL='rpool'
+
+       # Import the root pool, but don't mount it.  Doing `-R /` instead of
+       # `-R $rootmnt` keeps the namespace sensible after the pivot.
+       [ "$quiet" != "y" ] && log_begin_msg "Importing ZFS root pool $ZFS_RPOOL"
+       ZFS_STDERR=$(zpool import -R / -N "$ZFS_RPOOL" 2>&1)
+       ZFS_ERROR=$?
+       [ "$quiet" != "y" ] && log_end_msg
+
+       if [ "$ZFS_ERROR" -ne 0 ]
+       then
+               echo "Command: zpool import -R / -N $ZFS_RPOOL"
+               echo "Message: $ZFS_STDERR"
+               echo "Error: $ZFS_ERROR"
+               echo ""
+               echo "Manually import the root pool at the command prompt and then exit."
+               echo "Hint: Try:  zpool import -f -R / -N $ZFS_RPOOL"
+               /bin/sh
+       fi
+
+       if [ -z "$ZFS_BOOTFS" ]
+       then
+               [ "$quiet" != "y" ] && log_begin_msg "Getting ZFS bootfs property"
+               ZFS_BOOTFS=$(zpool list -H -o bootfs "$ZFS_RPOOL")
+               ZFS_ERROR=$?
+               [ "$quiet" != "y" ] && log_end_msg
+       fi
+
+       if [ -z "$ZFS_BOOTFS" ]
+       then
+               echo "Command: zpool list -H -o bootfs $ZFS_RPOOL"
+               echo "Error: $ZFS_ERROR, unable to get the bootfs property."
+               echo ""
+               echo "Manually mount the root filesystem on $rootmnt and then exit."
+               echo "Hint: Try:  mount -t zfs -o zfsutil $ZFS_RPOOL/ROOT/system $rootmnt"
+               /bin/sh 
+       fi
+
+       # Force the mountpoint to the only correct value for a root filesystem.
+       [ "$quiet" != "y" ] && log_begin_msg "Setting mountpoint=/ on ZFS filesystem $ZFS_BOOTFS"
+       ZFS_STDERR=$(zfs set -o mountpoint=/ "$ZFS_BOOTFS" 2>&1)
+       [ "$quiet" != "y" ] && log_end_msg
+
+       # Ideally, the root filesystem would be mounted like this:
+       #
+       #   zpool import -R "$rootmnt" -N "$ZFS_RPOOL"
+       #   zfs mount -o mountpoint=/ "$ZFS_BOOTFS"
+       #
+       # but the MOUNTPOINT prefix is preserved on descendent filesystem after
+       # the pivot into the regular root, which later breaks things like
+       # `zfs mount -a` and the /etc/mtab refresh.
+
+       [ "$quiet" != "y" ] && log_begin_msg "Mounting ZFS filesystem $ZFS_BOOTFS"
+       ZFS_STDERR=$(mount -t zfs -o zfsutil "$ZFS_BOOTFS" "$rootmnt" 2>&1)
+       ZFS_ERROR=$?
+       [ "$quiet" != "y" ] && log_end_msg
+
+       if [ "$ZFS_ERROR" -ne 0 ]
+       then
+               echo ""
+               echo "Command: mount -t zfs -o zfsutil $ZFS_BOOTFS $rootmnt"
+               echo "Message: $ZFS_STDERR"
+               echo "Error: $ZFS_ERROR"
+               echo ""
+               echo "Manually mount the root filesystem on $rootmnt and then exit."
+               /bin/sh 
+       fi
+
+       [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-bottom"
+       run_scripts /scripts/local-bottom
+       [ "$quiet" != "y" ] && log_end_msg
+}
diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..ad04952
--- /dev/null
@@ -0,0 +1,2 @@
+version=3
+http://githubredir.debian.net/github/zfs-linux/zfs/([\d\.].*).tar.gz
diff --git a/debian/zfs-dkms.dkms b/debian/zfs-dkms.dkms
new file mode 100644 (file)
index 0000000..4fe9b8d
--- /dev/null
@@ -0,0 +1,30 @@
+AUTOINSTALL="yes"
+PACKAGE_NAME="zfs"
+PACKAGE_VERSION="#MODULE_VERSION#"
+PRE_BUILD="configure --prefix=/usr --with-config=kernel --with-linux=$(case `lsb_release -is` in Debian) echo ${kernel_source_dir/%build/source};; *) echo ${kernel_source_dir};; esac) --with-linux-obj=${kernel_source_dir}"
+POST_REMOVE="rm -r /usr/src/zfs-#MODULE_VERSION#/${kernelver}"
+REMAKE_INITRD="no"
+MAKE[0]="make && make install-data-local && make -C include install"
+BUILT_MODULE_NAME[0]="zavl"
+BUILT_MODULE_LOCATION[0]="module/avl/"
+DEST_MODULE_LOCATION[0]="/extra/zfs/zavl"
+MAKE[1]="true"
+BUILT_MODULE_NAME[1]="zcommon"
+BUILT_MODULE_LOCATION[1]="module/zcommon/"
+DEST_MODULE_LOCATION[1]="/extra/zfs/zcommon"
+MAKE[2]="true"
+BUILT_MODULE_NAME[2]="znvpair"
+BUILT_MODULE_LOCATION[2]="module/nvpair/"
+DEST_MODULE_LOCATION[2]="/extra/zfs/znvpair"
+MAKE[3]="true"
+BUILT_MODULE_NAME[3]="zpios"
+BUILT_MODULE_LOCATION[3]="module/zpios/"
+DEST_MODULE_LOCATION[3]="/extra/zfs/zpios"
+MAKE[4]="true"
+BUILT_MODULE_NAME[4]="zunicode"
+BUILT_MODULE_LOCATION[4]="module/unicode/"
+DEST_MODULE_LOCATION[4]="/extra/zfs/zunicode"
+MAKE[5]="true"
+BUILT_MODULE_NAME[5]="zfs"
+BUILT_MODULE_LOCATION[5]="module/zfs/"
+DEST_MODULE_LOCATION[5]="/extra/zfs/zfs"
diff --git a/debian/zfs-dkms.docs b/debian/zfs-dkms.docs
new file mode 100644 (file)
index 0000000..bfe5e7f
--- /dev/null
@@ -0,0 +1,3 @@
+COPYRIGHT
+DISCLAIMER
+OPENSOLARIS.LICENSE
diff --git a/debian/zfs-dkms.install b/debian/zfs-dkms.install
new file mode 100644 (file)
index 0000000..b601f22
--- /dev/null
@@ -0,0 +1 @@
+usr/src
diff --git a/debian/zfs-dkms.postinst b/debian/zfs-dkms.postinst
new file mode 100644 (file)
index 0000000..07fe0c2
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+#DEBHELPER#
diff --git a/debian/zfs-dkms.prerm b/debian/zfs-dkms.prerm
new file mode 100644 (file)
index 0000000..07fe0c2
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+#DEBHELPER#
diff --git a/debian/zfs-dracut.install b/debian/zfs-dracut.install
new file mode 100644 (file)
index 0000000..74de57c
--- /dev/null
@@ -0,0 +1 @@
+usr/share/dracut
diff --git a/debian/zfs-initramfs.install b/debian/zfs-initramfs.install
new file mode 100644 (file)
index 0000000..b853d8e
--- /dev/null
@@ -0,0 +1 @@
+../tree/zfs-initramfs/* /
diff --git a/debian/zfs-initramfs.preinst b/debian/zfs-initramfs.preinst
new file mode 100644 (file)
index 0000000..af5657d
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+# @FIXME: During system start, the /etc/init/mountall.conf on Ubuntu is unable
+# to generate the /etc/mtab file from the /proc/mounts file if a ZFS filesystem
+# is already mounted.
+
+# This depends on mountall 2.18, which recognizes the link.
+ln -sf /proc/mounts /etc/mtab
+
+#DEBHELPER#
diff --git a/debian/zfsutils.docs b/debian/zfsutils.docs
new file mode 100644 (file)
index 0000000..bfe5e7f
--- /dev/null
@@ -0,0 +1,3 @@
+COPYRIGHT
+DISCLAIMER
+OPENSOLARIS.LICENSE
diff --git a/debian/zfsutils.examples b/debian/zfsutils.examples
new file mode 100644 (file)
index 0000000..89da091
--- /dev/null
@@ -0,0 +1,55 @@
+etc/zfs/zdev.conf.x4550.example
+etc/zfs/zdev.conf.supermicro.example
+etc/zfs/zdev.conf.dragon.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
diff --git a/debian/zfsutils.install b/debian/zfsutils.install
new file mode 100644 (file)
index 0000000..948a4c2
--- /dev/null
@@ -0,0 +1,5 @@
+etc/udev/rules.d/*.rules lib/udev/rules.d/
+etc/zfs/zdev.conf
+sbin
+lib/udev
+usr/share/man
diff --git a/debian/zfsutils.preinst b/debian/zfsutils.preinst
new file mode 100644 (file)
index 0000000..73e43e3
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+if [ -f /etc/default/zfsload ]
+then
+       mv /etc/default/zfsload /etc/default/zfs
+fi
+
+#DEBHELPER#
diff --git a/debian/zfsutils.zfs.default b/debian/zfsutils.zfs.default
new file mode 100644 (file)
index 0000000..215836d
--- /dev/null
@@ -0,0 +1,5 @@
+# Automatically run `zfs mount -a` at system startup if set non-empty.
+ZFS_MOUNT=''
+
+# Automatically run `zfs unmount -a` at system shutdown if set non-empty.
+ZFS_UNMOUNT=''
diff --git a/debian/zfsutils.zfs.init b/debian/zfsutils.zfs.init
new file mode 100644 (file)
index 0000000..50a1c6d
--- /dev/null
@@ -0,0 +1,62 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          zvol zfs
+# Required-Start:
+# Required-Stop: 
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start/stop ZFS subsystem.
+# Description:
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+. /lib/lsb/init-functions
+. /lib/init/vars.sh
+
+[ -f /etc/default/zfs ] && . /etc/default/zfs
+
+do_start() {
+       log_begin_msg "Starting ZFS subsystem..."
+       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 "Stopping ZFS subsystem..."
+       log_progress_msg "filesystems"
+       zfs umount -a
+       RET=$?
+       if [ $RET != 0 ] ; then
+               log_end_msg $RET
+       fi
+       log_end_msg 0
+}
+
+
+case "$1" in
+  start|"")
+       [ -z "$ZFS_MOUNT" ] && exit 0
+       do_start
+       ;;
+  restart|reload|force-reload)
+       echo "Error: argument '$1' not supported" >&2
+       exit 3
+       ;;
+  stop)
+       [ -z "$ZFS_UNMOUNT" ] && exit 0
+       do_stop
+       ;;
+  *)
+       echo "Usage: zfs [start|stop]" >&2
+       exit 3
+       ;;
+esac
+
+:
diff --git a/lib/libspl/asm-generic/atomic.S b/lib/libspl/asm-generic/atomic.S
deleted file mode 100644 (file)
index 7550fd9..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-Stub file for 'make dist' distdir rule.
-
-This file is directly referenced by ../Makefile.am as a source
-file and thus will be expected by 'make dist'.  To avoid this
-being a problem this stub file was added.  It will be overwritten
-at build time based on assmebly generated from atomic.c.
deleted file mode 120000 (symlink)
index 90b6e3c47c171773cc00b14db7d7619353e6d8ac..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-1x256th-65536rc-4rs-1cs-4off.sh
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..743e97b648f015dfafb11aad3c65494c4efee003
--- /dev/null
@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# Usage: zpios
+#        --threadcount       -t    =values
+#        --threadcount_low   -l    =value
+#        --threadcount_high  -h    =value
+#        --threadcount_incr  -e    =value
+#        --regioncount       -n    =values
+#        --regioncount_low   -i    =value
+#        --regioncount_high  -j    =value
+#        --regioncount_incr  -k    =value
+#        --offset            -o    =values
+#        --offset_low        -m    =value
+#        --offset_high       -q    =value
+#        --offset_incr       -r    =value
+#        --chunksize         -c    =values
+#        --chunksize_low     -a    =value
+#        --chunksize_high    -b    =value
+#        --chunksize_incr    -g    =value
+#        --regionsize        -s    =values
+#        --regionsize_low    -A    =value
+#        --regionsize_high   -B    =value
+#        --regionsize_incr   -C    =value
+#        --load              -L    =dmuio|ssf|fpp
+#        --pool              -p    =pool name
+#        --name              -M    =test name
+#        --cleanup           -x
+#        --prerun            -P    =pre-command
+#        --postrun           -R    =post-command
+#        --log               -G    =log directory
+#        --regionnoise       -I    =shift
+#        --chunknoise        -N    =bytes
+#        --threaddelay       -T    =jiffies
+#        --verify            -V
+#        --zerocopy          -z
+#        --nowait            -O
+#        --human-readable    -H
+#        --verbose           -v    =increase verbosity
+#        --help              -?    =this help
+
+ZPIOS_CMD="${ZPIOS}                                              \
+       --load=dmuio                                             \
+       --pool=${ZPOOL_NAME}                                     \
+       --name=${ZPOOL_CONFIG}                                   \
+       --threadcount=1,2,4,8,16,32,64,128,256                   \
+       --regioncount=65536                                      \
+       --regionsize=4M                                          \
+       --chunksize=1M                                           \
+       --offset=4M                                              \
+        --cleanup                                                \
+       --human-readable                                         \
+       ${ZPIOS_OPTIONS}"
+
+zpios_start() {
+       if [ ${VERBOSE} ]; then
+               ZPIOS_CMD="${ZPIOS_CMD} --verbose"
+               echo ${ZPIOS_CMD}
+       fi
+
+       ${ZPIOS_CMD} || exit 1
+}
+
+zpios_stop() {
+       [ ${VERBOSE} ] && echo
+}
deleted file mode 120000 (symlink)
index b8e22bf54b600ad0cb1eda352c5ca895a45f7927..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-256th-65536rc-4rs-1cs-4off.sh
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..92a3b77b482b864e89f89977247e4b336d2a6fe6
--- /dev/null
@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# Usage: zpios
+#        --threadcount       -t    =values
+#        --threadcount_low   -l    =value
+#        --threadcount_high  -h    =value
+#        --threadcount_incr  -e    =value
+#        --regioncount       -n    =values
+#        --regioncount_low   -i    =value
+#        --regioncount_high  -j    =value
+#        --regioncount_incr  -k    =value
+#        --offset            -o    =values
+#        --offset_low        -m    =value
+#        --offset_high       -q    =value
+#        --offset_incr       -r    =value
+#        --chunksize         -c    =values
+#        --chunksize_low     -a    =value
+#        --chunksize_high    -b    =value
+#        --chunksize_incr    -g    =value
+#        --regionsize        -s    =values
+#        --regionsize_low    -A    =value
+#        --regionsize_high   -B    =value
+#        --regionsize_incr   -C    =value
+#        --load              -L    =dmuio|ssf|fpp
+#        --pool              -p    =pool name
+#        --name              -M    =test name
+#        --cleanup           -x
+#        --prerun            -P    =pre-command
+#        --postrun           -R    =post-command
+#        --log               -G    =log directory
+#        --regionnoise       -I    =shift
+#        --chunknoise        -N    =bytes
+#        --threaddelay       -T    =jiffies
+#        --verify            -V
+#        --zerocopy          -z
+#        --nowait            -O
+#        --human-readable    -H
+#        --verbose           -v    =increase verbosity
+#        --help              -?    =this help
+
+ZPIOS_CMD="${ZPIOS}                                              \
+       --load=dmuio                                             \
+       --pool=${ZPOOL_NAME}                                     \
+       --name=${ZPOOL_CONFIG}                                   \
+       --threadcount=256                                        \
+       --regioncount=65536                                      \
+       --regionsize=4M                                          \
+       --chunksize=1M                                           \
+       --offset=4M                                              \
+        --cleanup                                                \
+       --human-readable                                         \
+       ${ZPIOS_OPTIONS}"
+
+zpios_start() {
+       if [ ${VERBOSE} ]; then
+               ZPIOS_CMD="${ZPIOS_CMD} --verbose"
+               echo ${ZPIOS_CMD}
+       fi
+
+       ${ZPIOS_CMD} || exit 1
+}
+
+zpios_stop() {
+       [ ${VERBOSE} ] && echo
+}
deleted file mode 120000 (symlink)
index d81027b7395be25fa229b2f8197c0803305492db..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-16th-8192rc-4rs-1cs-4off.sh
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..cbd9c697adc0f7fe062541f9c507c095706dcd0b
--- /dev/null
@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# Usage: zpios
+#        --threadcount       -t    =values
+#        --threadcount_low   -l    =value
+#        --threadcount_high  -h    =value
+#        --threadcount_incr  -e    =value
+#        --regioncount       -n    =values
+#        --regioncount_low   -i    =value
+#        --regioncount_high  -j    =value
+#        --regioncount_incr  -k    =value
+#        --offset            -o    =values
+#        --offset_low        -m    =value
+#        --offset_high       -q    =value
+#        --offset_incr       -r    =value
+#        --chunksize         -c    =values
+#        --chunksize_low     -a    =value
+#        --chunksize_high    -b    =value
+#        --chunksize_incr    -g    =value
+#        --regionsize        -s    =values
+#        --regionsize_low    -A    =value
+#        --regionsize_high   -B    =value
+#        --regionsize_incr   -C    =value
+#        --load              -L    =dmuio|ssf|fpp
+#        --pool              -p    =pool name
+#        --name              -M    =test name
+#        --cleanup           -x
+#        --prerun            -P    =pre-command
+#        --postrun           -R    =post-command
+#        --log               -G    =log directory
+#        --regionnoise       -I    =shift
+#        --chunknoise        -N    =bytes
+#        --threaddelay       -T    =jiffies
+#        --verify            -V
+#        --zerocopy          -z
+#        --nowait            -O
+#        --human-readable    -H
+#        --verbose           -v    =increase verbosity
+#        --help              -?    =this help
+
+ZPIOS_CMD="${ZPIOS}                                              \
+       --load=dmuio                                             \
+       --pool=${ZPOOL_NAME}                                     \
+       --name=${ZPOOL_CONFIG}                                   \
+       --threadcount=16                                         \
+       --regioncount=8192                                       \
+       --regionsize=4M                                          \
+       --chunksize=1M                                           \
+       --offset=4M                                              \
+       --cleanup                                                \
+       --human-readable                                         \
+       ${ZPIOS_OPTIONS}"
+
+zpios_start() {
+       if [ ${VERBOSE} ]; then
+               ZPIOS_CMD="${ZPIOS_CMD} --verbose"
+               echo ${ZPIOS_CMD}
+       fi
+
+       ${ZPIOS_CMD} || exit 1
+}
+
+zpios_stop() {
+       [ ${VERBOSE} ] && echo
+}
deleted file mode 120000 (symlink)
index cbf03b5ceeb963406ed942a7f24cafe64f795826..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-4th-1024rc-4rs-1cs-4off.sh
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..0db952cd65d2205c4016a50685cff97735d97a51
--- /dev/null
@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# Usage: zpios
+#        --threadcount       -t    =values
+#        --threadcount_low   -l    =value
+#        --threadcount_high  -h    =value
+#        --threadcount_incr  -e    =value
+#        --regioncount       -n    =values
+#        --regioncount_low   -i    =value
+#        --regioncount_high  -j    =value
+#        --regioncount_incr  -k    =value
+#        --offset            -o    =values
+#        --offset_low        -m    =value
+#        --offset_high       -q    =value
+#        --offset_incr       -r    =value
+#        --chunksize         -c    =values
+#        --chunksize_low     -a    =value
+#        --chunksize_high    -b    =value
+#        --chunksize_incr    -g    =value
+#        --regionsize        -s    =values
+#        --regionsize_low    -A    =value
+#        --regionsize_high   -B    =value
+#        --regionsize_incr   -C    =value
+#        --load              -L    =dmuio|ssf|fpp
+#        --pool              -p    =pool name
+#        --name              -M    =test name
+#        --cleanup           -x
+#        --prerun            -P    =pre-command
+#        --postrun           -R    =post-command
+#        --log               -G    =log directory
+#        --regionnoise       -I    =shift
+#        --chunknoise        -N    =bytes
+#        --threaddelay       -T    =jiffies
+#        --verify            -V
+#        --zerocopy          -z
+#        --nowait            -O
+#        --human-readable    -H
+#        --verbose           -v    =increase verbosity
+#        --help              -?    =this help
+
+ZPIOS_CMD="${ZPIOS}                                              \
+       --load=dmuio                                             \
+       --pool=${ZPOOL_NAME}                                     \
+       --name=${ZPOOL_CONFIG}                                   \
+       --threadcount=4                                          \
+       --regioncount=1024                                       \
+       --regionsize=4M                                          \
+       --chunksize=1M                                           \
+       --offset=4M                                              \
+       --cleanup                                                \
+       --human-readable                                         \
+       ${ZPIOS_OPTIONS}"
+
+zpios_start() {
+       if [ ${VERBOSE} ]; then
+               ZPIOS_CMD="${ZPIOS_CMD} --verbose"
+               echo ${ZPIOS_CMD}
+       fi
+
+       ${ZPIOS_CMD} || exit 1
+}
+
+zpios_stop() {
+       [ ${VERBOSE} ] && echo
+}
deleted file mode 120000 (symlink)
index ba8b7cd0c14dda42ccf75168e1135edb0a293915..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-1th-16rc-4rs-1cs-4off.sh
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..cd3c50b7737bba12020858a7b37cf5fec30cca73
--- /dev/null
@@ -0,0 +1,66 @@
+#!/bin/bash
+#
+# Usage: zpios
+#        --threadcount       -t    =values
+#        --threadcount_low   -l    =value
+#        --threadcount_high  -h    =value
+#        --threadcount_incr  -e    =value
+#        --regioncount       -n    =values
+#        --regioncount_low   -i    =value
+#        --regioncount_high  -j    =value
+#        --regioncount_incr  -k    =value
+#        --offset            -o    =values
+#        --offset_low        -m    =value
+#        --offset_high       -q    =value
+#        --offset_incr       -r    =value
+#        --chunksize         -c    =values
+#        --chunksize_low     -a    =value
+#        --chunksize_high    -b    =value
+#        --chunksize_incr    -g    =value
+#        --regionsize        -s    =values
+#        --regionsize_low    -A    =value
+#        --regionsize_high   -B    =value
+#        --regionsize_incr   -C    =value
+#        --load              -L    =dmuio|ssf|fpp
+#        --pool              -p    =pool name
+#        --name              -M    =test name
+#        --cleanup           -x
+#        --prerun            -P    =pre-command
+#        --postrun           -R    =post-command
+#        --log               -G    =log directory
+#        --regionnoise       -I    =shift
+#        --chunknoise        -N    =bytes
+#        --threaddelay       -T    =jiffies
+#        --verify            -V
+#        --zerocopy          -z
+#        --nowait            -O
+#        --human-readable    -H
+#        --verbose           -v    =increase verbosity
+#        --help              -?    =this help
+
+
+ZPIOS_CMD="${ZPIOS}                                              \
+       --load=dmuio                                             \
+       --pool=${ZPOOL_NAME}                                     \
+       --name=${ZPOOL_CONFIG}                                   \
+       --threadcount=1                                          \
+       --regioncount=16                                         \
+       --regionsize=4M                                          \
+       --chunksize=1M                                           \
+       --offset=4M                                              \
+       --cleanup                                                \
+       --human-readable                                         \
+       ${ZPIOS_OPTIONS}"
+
+zpios_start() {
+       if [ ${VERBOSE} ]; then
+               ZPIOS_CMD="${ZPIOS_CMD} --verbose"
+               echo ${ZPIOS_CMD}
+       fi
+
+       ${ZPIOS_CMD} || exit 1
+}
+
+zpios_stop() {
+       [ ${VERBOSE} ] && echo
+}