diff options
| author | Matthew Thode <[email protected]> | 2018-01-18 18:20:34 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-01-18 10:20:34 -0800 |
| commit | 7da8f8d81bf1fadc2d9dff10f0435fe601e919fa (patch) | |
| tree | c7cfb694f5a0fbf8a9645863476d1445d0ebdbb0 /contrib/dracut/90zfs/Makefile.am | |
| parent | 79c3270476b7140220c7946dd0a709a31bb9ed1b (diff) | |
Run zfs load-key if needed in dracut
'zfs load-key -a' will only be called if needed. If a dataset not
needed for boot does not have its key loaded (home directories for
example) boot can still continue.
zfs:AUTO was not working via dracut, so we still need the generator
script to do its thing.
Reviewed-by: Richard Yao <[email protected]>
Reviewed-by: Manuel Amador (Rudd-O) <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: loli10K <[email protected]>
Signed-off-by: Matthew Thode <[email protected]>
Closes #6982
Closes #7004
Diffstat (limited to 'contrib/dracut/90zfs/Makefile.am')
| -rw-r--r-- | contrib/dracut/90zfs/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/dracut/90zfs/Makefile.am b/contrib/dracut/90zfs/Makefile.am index a8f08bed7..afcd51022 100644 --- a/contrib/dracut/90zfs/Makefile.am +++ b/contrib/dracut/90zfs/Makefile.am @@ -5,6 +5,7 @@ pkgdracut_SCRIPTS = \ mount-zfs.sh \ parse-zfs.sh \ zfs-generator.sh \ + zfs-load-key.sh \ zfs-needshutdown.sh \ zfs-lib.sh @@ -14,6 +15,7 @@ EXTRA_DIST = \ $(top_srcdir)/contrib/dracut/90zfs/mount-zfs.sh.in \ $(top_srcdir)/contrib/dracut/90zfs/parse-zfs.sh.in \ $(top_srcdir)/contrib/dracut/90zfs/zfs-generator.sh.in \ + $(top_srcdir)/contrib/dracut/90zfs/zfs-load-key.sh.in \ $(top_srcdir)/contrib/dracut/90zfs/zfs-needshutdown.sh.in \ $(top_srcdir)/contrib/dracut/90zfs/zfs-lib.sh.in |