config/dkms.m4 | 14 14 + 0 - 0 !
config/user.m4 | 1 1 + 0 - 0 !
config/zfs-build.m4 | 2 1 + 1 - 0 !
3 files changed, 16 insertions(+), 1 deletion(-)

 block manual building in the dkms source tree.
  To avoid messing up future DKMS builds and the zfs installation,
  block manual building of the DKMS source tree.

config/zfs-meta.m4 | 34 29 + 5 - 0 !
1 file changed, 29 insertions(+), 5 deletions(-)

---

lib/libzfs/Makefile.am | 1 1 + 0 - 0 !
lib/libzfs_core/Makefile.am | 3 2 + 1 - 0 !
2 files changed, 3 insertions(+), 1 deletion(-)

---

lib/libspl/include/sys/isa_defs.h | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 fix endian build problem on ppc64el
  Drop endian override in powerpc architecture definition
  allowing both big and little endian builds.

lib/libefi/rdwr_efi.c | 3 2 + 1 - 0 !
lib/libspl/include/sys/isa_defs.h | 19 18 + 1 - 0 !
2 files changed, 20 insertions(+), 2 deletions(-)

 fix build problem on mips*
  Make sure required defines are set on mips.

cmd/zed/zed.d/zed.rc | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 enable zed emails
 The OpenZFS event daemon monitors pools.  This patch enables the email
 sending function by default (if zed is installed).  This is consistent with
 the default behavior of mdadm.

cmd/arc_summary/arc_summary.py | 2 1 + 1 - 0 !
cmd/arcstat/arcstat.py | 2 1 + 1 - 0 !
cmd/dbufstat/dbufstat.py | 2 1 + 1 - 0 !
3 files changed, 3 insertions(+), 3 deletions(-)

---

etc/systemd/system/zfs-zed.service.in | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix the path to the zed binary on the systemd unit.
 We install zed into /usr/sbin manually meanwhile the upstream default
 is installing it into /sbin.
 Ubuntu packages also install zed to /usr/sbin, but they ship their own
 zfs-zed unit.

cmd/mount_zfs/mount_zfs.c | 14 7 + 7 - 0 !
cmd/zfs/zfs_main.c | 23 12 + 11 - 0 !
cmd/zinject/translate.c | 2 1 + 1 - 0 !
contrib/initramfs/scripts/zfs | 7 3 + 4 - 0 !
etc/init.d/zfs-functions.in | 2 1 + 1 - 0 !
etc/init.d/zfs-mount.in | 4 2 + 2 - 0 !
lib/libspl/include/sys/mnttab.h | 2 1 + 1 - 0 !
lib/libzfs/libzfs_dataset.c | 11 6 + 5 - 0 !
lib/libzfs/libzfs_mount.c | 8 4 + 4 - 0 !
lib/libzfs/libzfs_util.c | 6 3 + 3 - 0 !
scripts/ziltest.sh | 6 5 + 1 - 0 !
11 files changed, 45 insertions(+), 40 deletions(-)

 change /etc/mtab to /proc/self/mounts
 Fix misleading error message: "The /dev/zfs device is missing and must be created.", if /etc/mtab is missing.

configure.ac | 1 1 + 0 - 0 !
contrib/dracut/02zfsexpandknowledge/Makefile.am | 22 22 + 0 - 0 !
contrib/dracut/02zfsexpandknowledge/module-setup.sh.in | 132 132 + 0 - 0 !
contrib/dracut/90zfs/Makefile.am | 3 3 + 0 - 0 !
contrib/dracut/90zfs/module-setup.sh.in | 19 18 + 1 - 0 !
contrib/dracut/90zfs/zfs-generator.sh.in | 39 39 + 0 - 0 !
contrib/dracut/Makefile.am | 2 1 + 1 - 0 !
7 files changed, 216 insertions(+), 2 deletions(-)

 [patch 001/530] fix booting via dracut generated initramfs

Dracut and Systemd updated how they integrate with each other, because
of this our current integrations stopped working (around the time
4.1.13 came out).  This patch addresses that issue and gets us booting
again.

Thanks to @Rudd-O for doing the work to get dracut working again and
letting me submit this on his behalf.

Signed-off-by: Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
Signed-off-by: Matthew Thode <mthode@mthode.org>
Closes #3605
Closes #4478

contrib/dracut/02zfsexpandknowledge/module-setup.sh.in | 19 11 + 8 - 0 !
contrib/dracut/90zfs/module-setup.sh.in | 17 9 + 8 - 0 !
contrib/dracut/90zfs/mount-zfs.sh.in | 10 10 + 0 - 0 !
contrib/dracut/90zfs/parse-zfs.sh.in | 6 5 + 1 - 0 !
contrib/dracut/90zfs/zfs-generator.sh.in | 10 9 + 1 - 0 !
contrib/dracut/90zfs/zfs-lib.sh.in | 18 18 + 0 - 0 !
etc/systemd/system/zfs-import-cache.service.in | 1 1 + 0 - 0 !
etc/systemd/system/zfs-import-scan.service.in | 1 1 + 0 - 0 !
8 files changed, 64 insertions(+), 18 deletions(-)

 [patch 032/530] a collection of dracut fixes

- In older systems without sysroot.mount, import before dracut-mount,
  and re-enable old dracut mount hook
- rootflags MUST be present even if the administrator neglected to
  specify it explicitly
- Check that mount.zfs exists in sbindir
- Remove awk and head as (now unused) requirements, add grep, and
  install the right mount.zfs
- Eliminate one use of grep in Dracut
- Use a more accurate grepping statement to identify zfsutil in rootflags
- Ensure that pooldev is nonempty
- Properly handle /dev/sd* devices and more
- Use new -P to get list of zpool devices
- Bail out of the generator when zfs:AUTO is on the root command line
- Ignore errors from systemctl trying to load sysroot.mount, we only
  care about the output
- Determine which one is the correct initqueuedir at run time.
- Add a compatibility getargbool for our detection / setup script.
- Update dracut .gitignore files

Signed-off-by: <Matthew Thode mthode@mthode.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4558
Closes #4562

contrib/dracut/90zfs/parse-zfs.sh.in | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 [patch 034/530] fix the test to use the variable

Signed-off-by: Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4645

contrib/dracut/02zfsexpandknowledge/Makefile.am | 4 2 + 2 - 0 !
contrib/dracut/90zfs/Makefile.am | 4 2 + 2 - 0 !
etc/init.d/Makefile.am | 4 2 + 2 - 0 !
etc/modules-load.d/Makefile.am | 4 2 + 2 - 0 !
etc/systemd/system/Makefile.am | 11 2 + 9 - 0 !
udev/rules.d/Makefile.am | 4 2 + 2 - 0 !
6 files changed, 12 insertions(+), 19 deletions(-)

 [patch 159/530] set proper dependency for string replacement targets

A lot of string replacement target don't have dependency or incorrect
dependency. We setup proper dependency by pattern rules.

Signed-off-by: Chunwei Chen <david.chen@osnexus.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4908

contrib/dracut/90zfs/module-setup.sh.in | 6 6 + 0 - 0 !
1 file changed, 6 insertions(+)

 [patch 219/530] adapt genkernel fix for zfsonlinux/zfs#4749 to zfs
 dracut module

Signed-off-by: Moritz Maxeiner <moritz@ucworks.org>

contrib/dracut/90zfs/mount-zfs.sh.in | 18 10 + 8 - 0 !
1 file changed, 10 insertions(+), 8 deletions(-)

 [patch 220/530] zfs dracut module should not assume systemd presence

Signed-off-by: Moritz Maxeiner <moritz@ucworks.org>

contrib/dracut/90zfs/module-setup.sh.in | 12 9 + 3 - 0 !
1 file changed, 9 insertions(+), 3 deletions(-)

 [patch 246/530] fix regression that broke dracut initramfs generation

Based upon @ryao's initial fix for 1c73494394fc9de9283b3fd4f00bcdf4bd300a7
( 5e9843405f63fdabe76e87b92b81a127d488abc7 ) this one also uses
`command -v` instead of `type`, but additionally only applies the
fix to close zfsonlinux/zfs#4749 when `libgcc_s.so.1` has not been included
by dracut automatically (verified by whether `zpool` links directly to
`libgcc_s.so`), as well as change the fallback option to match `libgcc_s.so*`.

Tested-by: Ben Jencks <ben@bjencks.net>

contrib/dracut/90zfs/mount-zfs.sh.in | 37 26 + 11 - 0 !
contrib/dracut/90zfs/zfs-generator.sh.in | 34 26 + 8 - 0 !
2 files changed, 52 insertions(+), 19 deletions(-)

 [patch 296/530] use a different technique to detect whether to
 mount-zfs

The behavior of the Dracut module was very wrong before.

The correct behavior: initramfs should not run `zfs-mount` to completion
if the two generator files exist.  If, however, one of them is missing,
it indicates one of three cases:

* The kernel command line did not specify a root ZFS file system, and
  another Dracut module is already handling root mount (via systemd).
  `mount-zfs` can run, but it will do nothing.
* There is no systemd to run `sysroot.mount` to begin with.
  `mount-zfs` must run.
* The root parameter is zfs:AUTO, which cannot be run in sysroot.mount.
  `mount-zfs` must run.

In any of these three cases, it is safe to run `zfs-mount` to completion.

`zfs-mount` must also delete itself if it determines it should not run,
or else Dracut will do the insane thing of running it over and over again.
Literally, the definition of insanity, doing the same thing that did not

contrib/dracut/90zfs/export-zfs.sh.in | 15 8 + 7 - 0 !
contrib/dracut/90zfs/module-setup.sh.in | 2 1 + 1 - 0 !
contrib/dracut/90zfs/mount-zfs.sh.in | 2 1 + 1 - 0 !
contrib/dracut/90zfs/zfs-lib.sh.in | 2 1 + 1 - 0 !
4 files changed, 11 insertions(+), 10 deletions(-)

 [patch 334/530] use -f to export pools so as not to dirty up device
 labels

contrib/dracut/90zfs/Makefile.am | 2 2 + 0 - 0 !
contrib/dracut/90zfs/module-setup.sh.in | 1 1 + 0 - 0 !
contrib/dracut/90zfs/mount-zfs.sh.in | 2 0 + 2 - 0 !
contrib/dracut/90zfs/zfs-needshutdown.sh.in | 10 10 + 0 - 0 !
4 files changed, 13 insertions(+), 2 deletions(-)

 [patch 336/530] properly use the dracut cleanup hook to order pool
 shutdown

When Dracut starts up, it needs to determine whether a pool will remain
"hanging open" before the system shuts off. In such a case, then the
code to clean up the pool (using the previous export -F work) must
be invoked. Since Dracut has had a recent change that makes
mount-zfs.sh simply not run when the root dataset is already mounted,
we must use the cleanup hook to order Dracut to do shutdown cleanup.

Important note: this code will not accomplish its stated goal until this
bug is fixed: https://bugzilla.redhat.com/show_bug.cgi?id=1385432

That bug impacts more than just ZFS. It impacts LUKS, dmraid, and
unmount during poweroff. It is a Fedora-wide bug.

contrib/initramfs/hooks/zfs | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix initramfs hook for merged /usr/lib and /lib

Under a merged `/lib` -> `/usr/lib` which renders `/lib` as a symlink,
`find /lib -type f -name libgcc_s.so.1` will not return a result as
`find` will not traverse the symlink. Modifying it to `find /lib/ -type
f -name libgcc_s.so.1` should work for both symlinked and non-symlinked
`/lib` directories.