From 6be2e8c12ebba3e602f1b52cdc7524e1ee4ce7f5 Mon Sep 17 00:00:00 2001 From: Maurice Zhou Date: Sun, 23 Apr 2023 19:56:37 +0200 Subject: [PATCH] Fedora: downgrade to 37 and test zfs repo link ZFS support for Fedora 38 is not yet available, see https://github.com/openzfs/zfs/issues/14725 Also enable blkdiscard by default. Signed-off-by: Maurice Zhou --- docs/Getting Started/Alpine Linux/Root on ZFS.rst | 4 ++-- docs/Getting Started/Arch Linux/Root on ZFS.rst | 4 ++-- docs/Getting Started/Fedora/Root on ZFS.rst | 13 ++++++++----- docs/Getting Started/Fedora/index.rst | 12 ++++++++---- docs/Getting Started/NixOS/Root on ZFS.rst | 4 ++-- .../RHEL-based distro/Root on ZFS.rst | 4 ++-- 6 files changed, 24 insertions(+), 17 deletions(-) diff --git a/docs/Getting Started/Alpine Linux/Root on ZFS.rst b/docs/Getting Started/Alpine Linux/Root on ZFS.rst index 7fc94dc..b4f15b2 100644 --- a/docs/Getting Started/Alpine Linux/Root on ZFS.rst +++ b/docs/Getting Started/Alpine Linux/Root on ZFS.rst @@ -203,12 +203,12 @@ System Installation especially those with existing ZFS pools or mdraid and those that have been used as live media. Those data structures may interfere with boot process. - For flash-based storage, this can be done by uncommenting the blkdiscard command below: + For flash-based storage, this can be done by the blkdiscard command below: :: partition_disk () { local disk="${1}" - #blkdiscard -f "${disk}" + blkdiscard -f "${disk}" || true parted --script --align=optimal "${disk}" -- \ mklabel gpt \ diff --git a/docs/Getting Started/Arch Linux/Root on ZFS.rst b/docs/Getting Started/Arch Linux/Root on ZFS.rst index 5b08fc8..1ae9029 100644 --- a/docs/Getting Started/Arch Linux/Root on ZFS.rst +++ b/docs/Getting Started/Arch Linux/Root on ZFS.rst @@ -200,12 +200,12 @@ System Installation especially those with existing ZFS pools or mdraid and those that have been used as live media. Those data structures may interfere with boot process. - For flash-based storage, this can be done by uncommenting the blkdiscard command below: + For flash-based storage, this can be done by the blkdiscard command below: :: partition_disk () { local disk="${1}" - #blkdiscard -f "${disk}" + blkdiscard -f "${disk}" || true parted --script --align=optimal "${disk}" -- \ mklabel gpt \ diff --git a/docs/Getting Started/Fedora/Root on ZFS.rst b/docs/Getting Started/Fedora/Root on ZFS.rst index d79e196..ce028d2 100644 --- a/docs/Getting Started/Fedora/Root on ZFS.rst +++ b/docs/Getting Started/Fedora/Root on ZFS.rst @@ -204,12 +204,12 @@ System Installation especially those with existing ZFS pools or mdraid and those that have been used as live media. Those data structures may interfere with boot process. - For flash-based storage, this can be done by uncommenting the blkdiscard command below: + For flash-based storage, this can be done by the blkdiscard command below: :: partition_disk () { local disk="${1}" - #blkdiscard -f "${disk}" + blkdiscard -f "${disk}" || true parted --script --align=optimal "${disk}" -- \ mklabel gpt \ @@ -399,10 +399,10 @@ System Configuration apk add curl curl --fail-early --fail -L \ - https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Container/x86_64/images/Fedora-Container-Base-38-1.6.x86_64.tar.xz \ + https://dl.fedoraproject.org/pub/fedora/linux/releases/37/Container/x86_64/images/Fedora-Container-Base-37-1.7.x86_64.tar.xz \ -o rootfs.tar.gz curl --fail-early --fail -L \ - https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Container/x86_64/images/Fedora-Container-38-1.6-x86_64-CHECKSUM \ + https://dl.fedoraproject.org/pub/fedora/linux/releases/37/Container/x86_64/images/Fedora-Container-37-1.7-x86_64-CHECKSUM \ -o checksum # BusyBox sha256sum treats all lines in the checksum file @@ -478,7 +478,7 @@ System Configuration .. code-block:: sh dnf -y install \ - https://zfsonlinux.org/fedora/zfs-release-2-2$(rpm --eval "%{dist}").noarch.rpm + https://zfsonlinux.org/fedora/zfs-release-2-2"$(rpm --eval "%{dist}"||true)".noarch.rpm dnf -y install zfs zfs-dracut @@ -487,6 +487,9 @@ System Configuration # this step will build zfs modules and fail # no need to test building in chroot + dnf -y install \ + https://zfsonlinux.org/fedora/zfs-release-2-2"$(rpm --eval "%{dist}"||true)".noarch.rpm + #. Check whether ZFS modules are successfully built .. code-block:: sh diff --git a/docs/Getting Started/Fedora/index.rst b/docs/Getting Started/Fedora/index.rst index 34d6333..3d2af10 100644 --- a/docs/Getting Started/Fedora/index.rst +++ b/docs/Getting Started/Fedora/index.rst @@ -48,10 +48,14 @@ see below. An option is to an LTS kernel from COPR, provided by a third-party. Use it at your own risk:: - # kwizart/kernel-longterm-5.10 - # kwizart/kernel-longterm-4.19 - dnf copr enable -y kwizart/kernel-longterm-5.4 - dnf install -y kernel-longterm kernel-longterm-devel + # this is a third-party repo! + # you have been warned. + # + # select a kernel from + # https://copr.fedorainfracloud.org/coprs/kwizart/ + + dnf copr enable -y kwizart/kernel-longterm-VERSION + dnf install -y kernel-longterm kernel-longterm-devel Reboot to new LTS kernel, then load kernel module:: diff --git a/docs/Getting Started/NixOS/Root on ZFS.rst b/docs/Getting Started/NixOS/Root on ZFS.rst index 96e5058..59edb00 100644 --- a/docs/Getting Started/NixOS/Root on ZFS.rst +++ b/docs/Getting Started/NixOS/Root on ZFS.rst @@ -151,12 +151,12 @@ System Installation especially those with existing ZFS pools or mdraid and those that have been used as live media. Those data structures may interfere with boot process. - For flash-based storage, this can be done by uncommenting the blkdiscard command below: + For flash-based storage, this can be done by the blkdiscard command below: :: partition_disk () { local disk="${1}" - #blkdiscard -f "${disk}" + blkdiscard -f "${disk}" || true parted --script --align=optimal "${disk}" -- \ mklabel gpt \ diff --git a/docs/Getting Started/RHEL-based distro/Root on ZFS.rst b/docs/Getting Started/RHEL-based distro/Root on ZFS.rst index 743fb2c..350db7d 100644 --- a/docs/Getting Started/RHEL-based distro/Root on ZFS.rst +++ b/docs/Getting Started/RHEL-based distro/Root on ZFS.rst @@ -199,12 +199,12 @@ System Installation especially those with existing ZFS pools or mdraid and those that have been used as live media. Those data structures may interfere with boot process. - For flash-based storage, this can be done by uncommenting the blkdiscard command below: + For flash-based storage, this can be done by the blkdiscard command below: :: partition_disk () { local disk="${1}" - #blkdiscard -f "${disk}" + blkdiscard -f "${disk}" || true parted --script --align=optimal "${disk}" -- \ mklabel gpt \