From 6fcf8e76be53e3949bae55b25bf9fcbb7eb97da2 Mon Sep 17 00:00:00 2001
From: Maurice Zhou <jasper@apvc.uk>
Date: Mon, 9 Aug 2021 10:45:09 +0800
Subject: [PATCH] Fedora: create bpool with compatibility property

update Arch Linux live loader entries

Signed-off-by: Maurice Zhou <jasper@apvc.uk>
---
 .../Root on ZFS/snippets/43_archiso.txt       | 43 +++++++++++++++----
 .../Root on ZFS/2-system-installation.rst     | 12 +-----
 .../Root on ZFS/4-optional-configuration.rst  | 12 +-----
 3 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/docs/Getting Started/Arch Linux/Root on ZFS/snippets/43_archiso.txt b/docs/Getting Started/Arch Linux/Root on ZFS/snippets/43_archiso.txt
index 81af445..93638a9 100644
--- a/docs/Getting Started/Arch Linux/Root on ZFS/snippets/43_archiso.txt	
+++ b/docs/Getting Started/Arch Linux/Root on ZFS/snippets/43_archiso.txt	
@@ -7,27 +7,52 @@ ls $ISO_PATH 1> /dev/null
 ESP_UUID=$(blkid -s UUID -o value $(df --output=source ${ISO_PATH} | tail -n +2))
 cat <<EOF
 submenu 'archiso' {
-    configfile \$prefix/archiso.cfg
-}
-EOF
-tee /boot/grub/archiso.cfg 1> /dev/null <<EOF
+rmmod tpm
 insmod search_fs_uuid
 set isorootuuid=$ESP_UUID
 search --fs-uuid --no-floppy --set=isopart \$isorootuuid
 set isopath=$ISO_REL
+configfile \$prefix/archiso.cfg
 EOF
 ISO_NUM=0
 for isofile in $ISO_PATH/archlinux-*.iso; do
     if [ "$ISO_NUM" -gt 300 ]; then break; fi
     isoname=${isofile##*/}
-tee -a /boot/grub/archiso.cfg 1> /dev/null <<EOF
-menuentry "$isoname" {
+cat <<EOF
+submenu "$isoname" {
+menuentry "Arch Linux install medium" {
     loopback loop0 (\$isopart)\$isopath/$isoname
-    linux (loop0)/arch/boot/x86_64/vmlinuz-linux earlymodules=loop img_dev=/dev/disk/by-uuid/\$isorootuuid img_loop=\$isopath/$isoname
-    initrd (loop0)/arch/boot/intel-ucode.img (loop0)/arch/boot/amd-ucode.img (loop0)/arch/boot/x86_64/initramfs-linux.img
+    linux  (loop0)/arch/boot/x86_64/vmlinuz-linux \\
+           earlymodules=loop img_dev=/dev/disk/by-uuid/\$isorootuuid img_loop=\$isopath/$isoname
+    initrd (loop0)/arch/boot/intel-ucode.img
+    initrd (loop0)/arch/boot/amd-ucode.img
+    initrd (loop0)/arch/boot/x86_64/initramfs-linux.img
+}
+menuentry "Arch Linux install medium, Copy to RAM" {
+    loopback loop0 (\$isopart)\$isopath/$isoname
+    linux  (loop0)/arch/boot/x86_64/vmlinuz-linux \\
+           earlymodules=loop img_dev=/dev/disk/by-uuid/\$isorootuuid img_loop=\$isopath/$isoname \\
+	   copytoram
+    initrd (loop0)/arch/boot/intel-ucode.img
+    initrd (loop0)/arch/boot/amd-ucode.img
+    initrd (loop0)/arch/boot/x86_64/initramfs-linux.img
+}
+menuentry "Arch Linux install medium with speech" {
+    loopback loop0 (\$isopart)\$isopath/$isoname
+    linux  (loop0)/arch/boot/x86_64/vmlinuz-linux \\
+           earlymodules=loop img_dev=/dev/disk/by-uuid/\$isorootuuid img_loop=\$isopath/$isoname \\
+	   accessibility=on
+    initrd (loop0)/arch/boot/intel-ucode.img
+    initrd (loop0)/arch/boot/amd-ucode.img
+    initrd (loop0)/arch/boot/x86_64/initramfs-linux.img
+}
 }
 EOF
 ISO_NUM=$(( $ISO_NUM + 1 ))
 done
+cat <<EOF
+}
+EOF
+
 # archiso kernel cmdline from
-# https://gitlab.archlinux.org/archlinux/archiso/-/blob/master/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf
+# https://gitlab.archlinux.org/archlinux/archiso/-/tree/master/configs/releng/efiboot/loader/entries
diff --git a/docs/Getting Started/Fedora/Root on ZFS/2-system-installation.rst b/docs/Getting Started/Fedora/Root on ZFS/2-system-installation.rst
index dd65d9f..f6d14aa 100644
--- a/docs/Getting Started/Fedora/Root on ZFS/2-system-installation.rst	
+++ b/docs/Getting Started/Fedora/Root on ZFS/2-system-installation.rst	
@@ -27,17 +27,7 @@ System Installation
 #. Create boot pool::
 
     zpool create \
-    -d -o feature@async_destroy=enabled \
-    -o feature@bookmarks=enabled \
-    -o feature@embedded_data=enabled \
-    -o feature@empty_bpobj=enabled \
-    -o feature@enabled_txg=enabled \
-    -o feature@extensible_dataset=enabled \
-    -o feature@filesystem_limits=enabled \
-    -o feature@hole_birth=enabled \
-    -o feature@large_blocks=enabled \
-    -o feature@lz4_compress=enabled \
-    -o feature@spacemap_histogram=enabled \
+        -o compatibility=grub2 \
         -o ashift=12 \
         -o autotrim=on \
         -O acltype=posixacl \
diff --git a/docs/Getting Started/Fedora/Root on ZFS/4-optional-configuration.rst b/docs/Getting Started/Fedora/Root on ZFS/4-optional-configuration.rst
index 7853e1f..8db2a2c 100644
--- a/docs/Getting Started/Fedora/Root on ZFS/4-optional-configuration.rst	
+++ b/docs/Getting Started/Fedora/Root on ZFS/4-optional-configuration.rst	
@@ -83,17 +83,7 @@ In test installation, GRUB took nearly 2 minutes to decrypt LUKS container.
 #. Recreate boot pool with mappers as vdev::
 
     zpool create \
-    -d -o feature@async_destroy=enabled \
-    -o feature@bookmarks=enabled \
-    -o feature@embedded_data=enabled \
-    -o feature@empty_bpobj=enabled \
-    -o feature@enabled_txg=enabled \
-    -o feature@extensible_dataset=enabled \
-    -o feature@filesystem_limits=enabled \
-    -o feature@hole_birth=enabled \
-    -o feature@large_blocks=enabled \
-    -o feature@lz4_compress=enabled \
-    -o feature@spacemap_histogram=enabled \
+        -o compatibility=grub2 \
         -o ashift=12 \
         -o autotrim=on \
         -O acltype=posixacl \