From 2d303ead8237188ce3032bcc5b6b903f680e8724 Mon Sep 17 00:00:00 2001
From: Maurice Zhou <jasper@apvc.uk>
Date: Sun, 2 Apr 2023 23:14:35 +0200
Subject: [PATCH] Arch Linux: adjust mkinitcpio parameters

Signed-off-by: Maurice Zhou <jasper@apvc.uk>
---
 .../Arch Linux/Root on ZFS/1-preparation.rst           | 10 ++++++----
 .../Arch Linux/Root on ZFS/3-system-configuration.rst  |  5 +----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/Getting Started/Arch Linux/Root on ZFS/1-preparation.rst b/docs/Getting Started/Arch Linux/Root on ZFS/1-preparation.rst
index d0f2c14..bd8856c 100644
--- a/docs/Getting Started/Arch Linux/Root on ZFS/1-preparation.rst	
+++ b/docs/Getting Started/Arch Linux/Root on ZFS/1-preparation.rst	
@@ -7,7 +7,9 @@ Preparation
    :local:
 
 #. Disable Secure Boot. ZFS modules can not be loaded if Secure Boot is enabled.
-#. Download latest `Arch Linux live image  <https://archlinux.org/download/>`__ and boot from it.
+#. Download an older `Arch Linux live image
+   <https://geo.mirror.pkgbuild.com/iso/>`__ and boot from it.  Latest
+   image may lack a compatible kernel.
 #. Connect to the Internet.
 #. Set root password or ``/root/.ssh/authorized_keys``.
 #. Start SSH server::
@@ -81,7 +83,7 @@ Preparation
       curl -L https://archzfs.com/archive_archzfs/ \
       | grep zfs-linux-[0-9] \
       | grep -v src.tar \
-      | grep "5.18.7"
+      | grep --color "5.18.7"
       # ...<a href="zfs-linux-2.1.5_5.18.7.arch1.1-1-x86_64.pkg.tar.zst">...
 
    Result: https/.../archive_archzfs/zfs-linux-2.1.5_5.18.7.arch1.1-1-x86_64.pkg.tar.zst
@@ -91,8 +93,8 @@ Preparation
    Search ZFS version string (e.g. 2.1.5) in both pages above::
 
       curl -L https://archzfs.com/archzfs/x86_64/ \
-      | grep zfs-utils-2.1.5 \
-      | grep -v src.tar
+      | grep -v src.tar \
+      | grep --color zfs-utils-2.1.5
       # ...<a href="zfs-utils-2.1.5-1-x86_64.pkg.tar.zst">...
 
    Result: https/.../archzfs/x86_64/zfs-utils-2.1.5-2-x86_64.pkg.tar.zst
diff --git a/docs/Getting Started/Arch Linux/Root on ZFS/3-system-configuration.rst b/docs/Getting Started/Arch Linux/Root on ZFS/3-system-configuration.rst
index 64d780a..c804e29 100644
--- a/docs/Getting Started/Arch Linux/Root on ZFS/3-system-configuration.rst	
+++ b/docs/Getting Started/Arch Linux/Root on ZFS/3-system-configuration.rst	
@@ -29,10 +29,7 @@ System Configuration
 
 #. Configure mkinitcpio::
 
-     mv /mnt/etc/mkinitcpio.conf /mnt/etc/mkinitcpio.conf.original
-     tee /mnt/etc/mkinitcpio.conf <<EOF
-     HOOKS=(base udev autodetect modconf block keyboard zfs filesystems)
-     EOF
+     sed -i 's|filesystems|zfs filesystems|' /mnt/etc/mkinitcpio.conf
 
 #. Enable internet time synchronisation::