diff options
| author | LOLi <[email protected]> | 2018-02-12 20:40:00 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-02-12 11:40:00 -0800 |
| commit | a893627fac8d4ed37cf00e671322dfdaa02d4f1c (patch) | |
| tree | bebac88ecdde0bea8f1b462edb132535fd0b948d | |
| parent | 918dbe35b50649edfce85d61b122be1510152433 (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
| -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 b1ab0c951..87ec7a86f 100644 --- a/contrib/initramfs/Makefile.am +++ b/contrib/initramfs/Makefile.am @@ -1,15 +1,17 @@ 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 SUBDIRS = hooks scripts EXTRA_DIST = \ + $(top_srcdir)/contrib/initramfs/conf.d/zfs \ $(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \ $(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 |