diff options
| author | LOLi <[email protected]> | 2018-02-12 20:40:00 +0100 |
|---|---|---|
| committer | Tony Hutter <[email protected]> | 2018-03-14 16:10:37 -0700 |
| commit | a9ff89e05cd2f420e44b0e50c92d97c166772d2b (patch) | |
| tree | 04977d8dc1341ceb17b1449b23877ea9429ea52e /contrib | |
| parent | d85011ed696b41f4de963f7932dfb53ea871278b (diff) | |
contrib/initramfs: add missing conf.d/zfs
When upgrading from the distribution-provided zfs-initramfs package on
root-on-zfs Ubuntu and Debian the system may fail to boot: this change
adds the missing initramfs configuration file.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Richard Laager <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #7158
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/initramfs/Makefile.am | 6 | ||||
| -rw-r--r-- | contrib/initramfs/conf.d/zfs | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am index 998e588ab..b22940821 100644 --- a/contrib/initramfs/Makefile.am +++ b/contrib/initramfs/Makefile.am @@ -1,8 +1,10 @@ initrddir = $(datarootdir)/initramfs-tools -initrd_SCRIPTS = conf-hooks.d/zfs hooks/zfs scripts/zfs scripts/local-top/zfs +initrd_SCRIPTS = \ + conf.d/zfs conf-hooks.d/zfs hooks/zfs scripts/zfs scripts/local-top/zfs EXTRA_DIST = \ + $(top_srcdir)/contrib/initramfs/conf.d/zfs \ $(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \ $(top_srcdir)/contrib/initramfs/hooks/zfs \ $(top_srcdir)/contrib/initramfs/scripts/zfs \ @@ -10,7 +12,7 @@ EXTRA_DIST = \ $(top_srcdir)/contrib/initramfs/README.initramfs.markdown install-initrdSCRIPTS: $(EXTRA_DIST) - for d in conf-hooks.d hooks scripts scripts/local-top; do \ + for d in conf.d conf-hooks.d hooks scripts scripts/local-top; do \ $(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \ cp $(top_srcdir)/contrib/initramfs/$$d/zfs \ $(DESTDIR)$(initrddir)/$$d/; \ diff --git a/contrib/initramfs/conf.d/zfs b/contrib/initramfs/conf.d/zfs new file mode 100644 index 000000000..c67d75ba8 --- /dev/null +++ b/contrib/initramfs/conf.d/zfs @@ -0,0 +1,8 @@ +for x in $(cat /proc/cmdline) +do + case $x in + root=ZFS=*|root=zfs:*) + BOOT=zfs + ;; + esac +done |