projects / zfsonlinux.git / blame
| Commit | Line | Data |
|---|---|---|
| 75b07eca FG |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | From: LOLi <loli10K@users.noreply.github.com> | |
| 3 | Date: Mon, 12 Feb 2018 20:40:00 +0100 | |
| 4 | Subject: [PATCH] contrib/initramfs: add missing conf.d/zfs | |
| 5 | MIME-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ||
| 9 | When upgrading from the distribution-provided zfs-initramfs package on | |
| 10 | root-on-zfs Ubuntu and Debian the system may fail to boot: this change | |
| 11 | adds the missing initramfs configuration file. | |
| 12 | ||
| 13 | Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> | |
| 14 | Reviewed-by: Richard Laager <rlaager@wiktel.com> | |
| 15 | Signed-off-by: loli10K <ezomori.nozomu@gmail.com> | |
| 16 | Closes #7158 | |
| 17 | (cherry picked from commit a9ff89e05cd2f420e44b0e50c92d97c166772d2b) | |
| 18 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
| 19 | --- | |
| 20 | contrib/initramfs/Makefile.am | 6 ++++-- | |
| 21 | contrib/initramfs/conf.d/zfs | 8 ++++++++ | |
| 22 | 2 files changed, 12 insertions(+), 2 deletions(-) | |
| 23 | create mode 100644 contrib/initramfs/conf.d/zfs | |
| 24 | ||
| 25 | diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am | |
| 26 | index 998e588ab..b22940821 100644 | |
| 27 | --- a/contrib/initramfs/Makefile.am | |
| 28 | +++ b/contrib/initramfs/Makefile.am | |
| 29 | @@ -1,8 +1,10 @@ | |
| 30 | initrddir = $(datarootdir)/initramfs-tools | |
| 31 | ||
| 32 | -initrd_SCRIPTS = conf-hooks.d/zfs hooks/zfs scripts/zfs scripts/local-top/zfs | |
| 33 | +initrd_SCRIPTS = \ | |
| 34 | + conf.d/zfs conf-hooks.d/zfs hooks/zfs scripts/zfs scripts/local-top/zfs | |
| 35 | ||
| 36 | EXTRA_DIST = \ | |
| 37 | + $(top_srcdir)/contrib/initramfs/conf.d/zfs \ | |
| 38 | $(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \ | |
| 39 | $(top_srcdir)/contrib/initramfs/hooks/zfs \ | |
| 40 | $(top_srcdir)/contrib/initramfs/scripts/zfs \ | |
| 41 | @@ -10,7 +12,7 @@ EXTRA_DIST = \ | |
| 42 | $(top_srcdir)/contrib/initramfs/README.initramfs.markdown | |
| 43 | ||
| 44 | install-initrdSCRIPTS: $(EXTRA_DIST) | |
| 45 | - for d in conf-hooks.d hooks scripts scripts/local-top; do \ | |
| 46 | + for d in conf.d conf-hooks.d hooks scripts scripts/local-top; do \ | |
| 47 | $(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \ | |
| 48 | cp $(top_srcdir)/contrib/initramfs/$$d/zfs \ | |
| 49 | $(DESTDIR)$(initrddir)/$$d/; \ | |
| 50 | diff --git a/contrib/initramfs/conf.d/zfs b/contrib/initramfs/conf.d/zfs | |
| 51 | new file mode 100644 | |
| 52 | index 000000000..c67d75ba8 | |
| 53 | --- /dev/null | |
| 54 | +++ b/contrib/initramfs/conf.d/zfs | |
| 55 | @@ -0,0 +1,8 @@ | |
| 56 | +for x in $(cat /proc/cmdline) | |
| 57 | +do | |
| 58 | + case $x in | |
| 59 | + root=ZFS=*|root=zfs:*) | |
| 60 | + BOOT=zfs | |
| 61 | + ;; | |
| 62 | + esac | |
| 63 | +done | |
| 64 | -- | |
| 65 | 2.14.2 | |
| 66 |