From 1442ba8828a2a52b812c3aa7fc40dedd69298feb Mon Sep 17 00:00:00 2001
From: Maurice Zhou <ja@apvc.uk>
Date: Wed, 3 Feb 2021 16:59:01 +0800
Subject: [PATCH] Update Arch LiveCD; Use IgnorePkg

---
 .../Arch Linux/Arch Linux Root on ZFS.rst     |  4 +--
 .../Arch Linux/Artix Linux Root on ZFS.rst    |  8 +++---
 docs/Getting Started/Arch Linux/index.rst     | 25 ++++++++++---------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/docs/Getting Started/Arch Linux/Arch Linux Root on ZFS.rst b/docs/Getting Started/Arch Linux/Arch Linux Root on ZFS.rst
index 3040d7f..552bbec 100644
--- a/docs/Getting Started/Arch Linux/Arch Linux Root on ZFS.rst	
+++ b/docs/Getting Started/Arch Linux/Arch Linux Root on ZFS.rst	
@@ -82,12 +82,12 @@ Download Arch Linux live image
 
     https://archlinux.org/mirrorlist/all/
 
-#. Download January 2021 build. `File a new issue and mention @ne9z
+#. Download Feb 2021 build. `File a new issue and mention @ne9z
    <https://github.com/openzfs/openzfs-docs/issues/new?body=@ne9z,%20Update%20Live%20Image%20Arch%20Linux%20Root%20on
    %20ZFS%20HOWTO:>`__ if it's
    no longer available.
 
-    https://mirrors.dotsrc.org/archlinux/iso/2021.01.01/archlinux-2021.01.01-x86_64.iso
+    https://mirrors.dotsrc.org/archlinux/iso/2021.02.01/archlinux-2021.02.01-x86_64.iso
 
 #. Write the image to a USB drive or an optical disc.
 
diff --git a/docs/Getting Started/Arch Linux/Artix Linux Root on ZFS.rst b/docs/Getting Started/Arch Linux/Artix Linux Root on ZFS.rst
index d8bb3d0..f768a92 100644
--- a/docs/Getting Started/Arch Linux/Artix Linux Root on ZFS.rst	
+++ b/docs/Getting Started/Arch Linux/Artix Linux Root on ZFS.rst	
@@ -573,9 +573,7 @@ Package Installation
    Visit OpenZFS release page::
 
     curl https://github.com/openzfs/zfs/releases/zfs-${DKMS_VER} \
-    | grep Linux \
-    | grep compat \
-    | grep kernel
+    | grep Linux
     # Linux: compatible with 3.10 - 5.10 kernels
 
    If the kernel is supported:
@@ -617,8 +615,8 @@ Package Installation
 
 #. Hold kernel package from updates::
 
-    sed -i 's/#.*HoldPkg/HoldPkg/' $INST_MNT/etc/pacman.conf
-    sed -i "/^HoldPkg/ s/$/ ${INST_LINVAR} ${INST_LINVAR}-headers/" $INST_MNT/etc/pacman.conf
+    sed -i 's/#IgnorePkg/IgnorePkg/' $INST_MNT/etc/pacman.conf
+    sed -i "/^IgnorePkg/ s/$/ ${INST_LINVAR} ${INST_LINVAR}-headers/" $INST_MNT/etc/pacman.conf
 
    Kernel must be manually updated, see kernel update section in Getting Started.
 
diff --git a/docs/Getting Started/Arch Linux/index.rst b/docs/Getting Started/Arch Linux/index.rst
index b4960ec..b49ea6e 100644
--- a/docs/Getting Started/Arch Linux/index.rst	
+++ b/docs/Getting Started/Arch Linux/index.rst	
@@ -44,6 +44,8 @@ Prebuilt zfs package
 
 This only applies to vanilla Arch Linux kernels.
 For other kernels, use `archzfs-dkms package`_.
+You can also switch between DKMS and prebuilt
+packages with instructions on this page.
 
 Check kernel variant::
 
@@ -90,7 +92,7 @@ kernel updates::
 
 Temporarily ignore kernel update to upgrade other packages::
 
- pacman -Syu --ignore=linux=lts
+ pacman -Syu --ignore=linux-lts
 
 archzfs-dkms package
 ~~~~~~~~~~~~~~~~~~~~
@@ -117,9 +119,7 @@ Check newer archzfs-dkms package version::
 Visit OpenZFS release page ::
 
  curl https://github.com/openzfs/zfs/releases/zfs-${DKMS_VER} \
- | grep Linux \
- | grep compat \
- | grep kernel
+ | grep Linux
  # Linux: compatible with 3.10 - 5.10 kernels
 
 If it's not supported, see `Install alternative kernel`_.
@@ -148,8 +148,8 @@ Install archzfs-dkms::
 
 Hold kernel package from updates::
 
-  sed -i 's/#.*HoldPkg/HoldPkg/' /etc/pacman.conf
-  sed -i "/^HoldPkg/ s/$/ ${INST_LINVAR} ${INST_LINVAR}-headers/" /etc/pacman.conf
+  sed -i 's/#.*IgnorePkg/IgnorePkg/' /etc/pacman.conf
+  sed -i "/^IgnorePkg/ s/$/ ${INST_LINVAR} ${INST_LINVAR}-headers/" /etc/pacman.conf
 
 Kernel must be manually updated, see `Kernel update`_.
 
@@ -199,8 +199,8 @@ Install archzfs-dkms::
 
 Hold kernel package from updates::
 
-  sed -i 's/#.*HoldPkg/HoldPkg/' /etc/pacman.conf
-  sed -i "/^HoldPkg/ s/$/ ${INST_LINVAR} ${INST_LINVAR}-headers/" /etc/pacman.conf
+  sed -i 's/#IgnorePkg/IgnorePkg/' /etc/pacman.conf
+  sed -i "/^IgnorePkg/ s/$/ ${INST_LINVAR} ${INST_LINVAR}-headers/" /etc/pacman.conf
 
 Kernel must be manually updated, see `Kernel update`_.
 
@@ -222,14 +222,15 @@ Check newer kernel version::
 
 Check newer archzfs-dkms package version::
 
- pacman -Si zfs-dkms \
+ DKMS_VER=$(pacman -Si zfs-dkms \
  | grep 'Version' \
  | awk '{ print $3 }' \
- | sed 's|-.*||'
- # 2.0.1
+ | sed 's|-.*||')
 
-Visit OpenZFS release page https://github.com/openzfs/zfs/releases/zfs-2.0.1::
+Visit OpenZFS release page ::
 
+ curl https://github.com/openzfs/zfs/releases/zfs-${DKMS_VER} \
+ | grep Linux
  # Linux: compatible with 3.10 - 5.10 kernels
 
 If compatible, update kernel with::