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 <behlendorf1@llnl.gov>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #7158

diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
index 998e588aba7209b444e06b5daf70341d8cd46dfd..b2294082180e52c9c326b301b13fff515c285b3e 100644 (file)
--- 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 (file)
index 0000000..c67d75b
--- /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