| 1 |
commit: 8efdd74ac4ff2008f3f7e67be92a892ebe31c00c |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 2 19:22:53 2021 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 2 19:22:53 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8efdd74a |
| 7 |
|
| 8 |
sys-fs/zfs-kmod: adjust postinst phase |
| 9 |
|
| 10 |
remove old migration code, it was needed for migration from |
| 11 |
0.6x versions. |
| 12 |
|
| 13 |
make grub section conditional and mention new compat filag |
| 14 |
|
| 15 |
zpool create -o compatibility=grub2 ... |
| 16 |
|
| 17 |
https://github.com/openzfs/zfs/pull/11468 |
| 18 |
|
| 19 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 20 |
|
| 21 |
sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild | 40 ++++++++++++----------------------- |
| 22 |
1 file changed, 13 insertions(+), 27 deletions(-) |
| 23 |
|
| 24 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild |
| 25 |
index 9306651ee82..1bb0a99b0c6 100644 |
| 26 |
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild |
| 27 |
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild |
| 28 |
@@ -165,15 +165,6 @@ src_install() { |
| 29 |
pkg_postinst() { |
| 30 |
linux-mod_pkg_postinst |
| 31 |
|
| 32 |
- # Remove old modules |
| 33 |
- if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then |
| 34 |
- ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs" |
| 35 |
- ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs" |
| 36 |
- ewarn "Automatically removing old modules to avoid problems." |
| 37 |
- rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" |
| 38 |
- rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon" |
| 39 |
- fi |
| 40 |
- |
| 41 |
if [[ -z ${ROOT} ]] && use dist-kernel; then |
| 42 |
set_arch_to_portage |
| 43 |
dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" |
| 44 |
@@ -184,22 +175,17 @@ pkg_postinst() { |
| 45 |
ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." |
| 46 |
fi |
| 47 |
|
| 48 |
- ewarn "This version of OpenZFS includes support for new feature flags" |
| 49 |
- ewarn "that are incompatible with previous versions. GRUB2 support for" |
| 50 |
- ewarn "/boot with the new feature flags is not yet available." |
| 51 |
- ewarn "Do *NOT* upgrade root pools to use the new feature flags." |
| 52 |
- ewarn "Any new pools will be created with the new feature flags by default" |
| 53 |
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To" |
| 54 |
- ewarn "create a newpool that is backward compatible wih GRUB2, use " |
| 55 |
- ewarn |
| 56 |
- ewarn "zpool create -d -o feature@async_destroy=enabled " |
| 57 |
- ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" |
| 58 |
- ewarn " -o feature@spacemap_histogram=enabled" |
| 59 |
- ewarn " -o feature@enabled_txg=enabled " |
| 60 |
- ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" |
| 61 |
- ewarn " ..." |
| 62 |
- ewarn |
| 63 |
- ewarn "GRUB2 support will be updated as soon as either the GRUB2" |
| 64 |
- ewarn "developers do a tag or the Gentoo developers find time to backport" |
| 65 |
- ewarn "support from GRUB2 HEAD." |
| 66 |
+ if has_version sys-boot/grub; then |
| 67 |
+ ewarn "This version of OpenZFS includes support for new feature flags" |
| 68 |
+ ewarn "that are incompatible with previous versions. GRUB2 support for" |
| 69 |
+ ewarn "/boot with the new feature flags is not yet available." |
| 70 |
+ ewarn "Do *NOT* upgrade root pools to use the new feature flags." |
| 71 |
+ ewarn "Any new pools will be created with the new feature flags by default" |
| 72 |
+ ewarn "and will not be compatible with older versions of ZFSOnLinux. To" |
| 73 |
+ ewarn "create a newpool that is backward compatible wih GRUB2, use " |
| 74 |
+ ewarn |
| 75 |
+ ewarn "zpool create -o compatibility=grub2 ..." |
| 76 |
+ ewarn |
| 77 |
+ ewarn "Refer to /etc/zfs/compatibility.d/grub2 for list of features." |
| 78 |
+ fi |
| 79 |
} |
Archives