diff --git a/docs/Getting Started/Arch Linux/0-archzfs-repo.rst b/docs/Getting Started/Arch Linux/0-archzfs-repo.rst index 992aa60..f14308f 100644 --- a/docs/Getting Started/Arch Linux/0-archzfs-repo.rst +++ b/docs/Getting Started/Arch Linux/0-archzfs-repo.rst @@ -13,7 +13,7 @@ You can use it as follows. #. Import keys of archzfs repository:: curl -L https://archzfs.com/archzfs.gpg | pacman-key -a - - curl -L https://git.io/JsfVS | xargs -i{} pacman-key --lsign-key {} + pacman-key --lsign-key $(curl -L https://git.io/JsfVS) curl -L https://git.io/Jsfw2 > /etc/pacman.d/mirrorlist-archzfs #. Add archzfs repository:: diff --git a/docs/Getting Started/Arch Linux/2-zfs-dkms.rst b/docs/Getting Started/Arch Linux/2-zfs-dkms.rst index 5edb339..9a5dbb9 100644 --- a/docs/Getting Started/Arch Linux/2-zfs-dkms.rst +++ b/docs/Getting Started/Arch Linux/2-zfs-dkms.rst @@ -25,7 +25,9 @@ Installation #. Check kernel variant:: INST_LINVAR=$(sed 's|.*linux|linux|' /proc/cmdline | sed 's|.img||g' | awk '{ print $1 }') - #for live image + + If you are using live image, use the hard-coded value:: + #INST_LINVAR=linux #. Check kernel version:: 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 56659f5..718a122 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,13 +7,13 @@ Preparation :local: #. Download - `2021.09.01 `__ - Live ISO and `signature `__. + `2021.11.01 `__ + Live ISO and `signature `__. #. Follow `installation guide on Arch wiki `__ up to **Update the system clock**. -#. Set root password or ``/root/authorized_keys``. +#. Set root password or ``/root/.ssh/authorized_keys``. #. Start SSH server:: systemctl start sshd diff --git a/docs/Getting Started/Arch Linux/Root on ZFS/4-optional-configuration.rst b/docs/Getting Started/Arch Linux/Root on ZFS/4-optional-configuration.rst index bb66f78..e69af9f 100644 --- a/docs/Getting Started/Arch Linux/Root on ZFS/4-optional-configuration.rst +++ b/docs/Getting Started/Arch Linux/Root on ZFS/4-optional-configuration.rst @@ -17,10 +17,14 @@ instance of an operating system. Within the context of this installation, boot environments can be created on-the-fly to preserve root file system states before pacman transactions. -Install ``bieaz`` from AUR. Optionally install ``rozb3-pac`` from AUR -for pacman integration. +Install an AUR helper of choice then install ``rozb3-pac`` from AUR +for pacman integration:: -See `home page `__ for details. + pacman -S --needed git base-devel + git clone https://aur.archlinux.org/paru-bin.git + cd paru-bin + makepkg -si + paru -S rozb3-pac Supply password with SSH ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -256,9 +260,9 @@ boot from it. This enables system recovery and re-installation. mkdir /boot/efi/iso cd /boot/efi/iso - # select a mirror # curl -O https://mirrors.ocf.berkeley.edu/archlinux/iso/2021.09.01/archlinux-2021.09.01-x86_64.iso - curl -O https://archlinux.org/iso/2021.09.01/archlinux-2021.09.01-x86_64.iso.sig - gpg --auto-key-retrieve --verify archlinux-2021.09.01-x86_64.iso.sig + # select a mirror # curl -O https://mirrors.ocf.berkeley.edu/archlinux/iso/2021.11.01/archlinux-2021.11.01-x86_64.iso + curl -O https://archlinux.org/iso/2021.11.01/archlinux-2021.11.01-x86_64.iso.sig + gpg --auto-key-retrieve --verify archlinux-2021.11.01-x86_64.iso.sig Additionally you can build your own live image with `archiso package `__. diff --git a/docs/Getting Started/Fedora/Root on ZFS/1-preparation.rst b/docs/Getting Started/Fedora/Root on ZFS/1-preparation.rst index 5b889fa..b997024 100644 --- a/docs/Getting Started/Fedora/Root on ZFS/1-preparation.rst +++ b/docs/Getting Started/Fedora/Root on ZFS/1-preparation.rst @@ -13,7 +13,7 @@ Preparation - `Fedora Workstation (GNOME) `__ - `Fedora Spins (Xfce, i3, ...) `__ -#. Set root password or ``/root/authorized_keys``. +#. Set root password or ``/root/.ssh/authorized_keys``. #. Start SSH server:: echo PermitRootLogin yes >> /etc/ssh/sshd_config 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 4486da3..d990cad 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 @@ -238,3 +238,8 @@ System Installation #. Install ZFS:: dnf --installroot=/mnt -y install zfs zfs-dracut + +#. Optional: enable boot environment support and dnf integration:: + + dnf --installroot=/mnt copr enable -y m0p/bieaz + dnf --installroot=/mnt install -y bieaz python3-dnf-plugin-rozb3 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 deleted file mode 100644 index bdb431b..0000000 --- a/docs/Getting Started/Fedora/Root on ZFS/4-optional-configuration.rst +++ /dev/null @@ -1,21 +0,0 @@ -.. highlight:: sh - -Optional Configuration -====================== - -.. contents:: Table of Contents - :local: - -Skip to `bootloader <5-bootloader.html>`__ section if -no optional configuration is needed. - -Boot environment manager -~~~~~~~~~~~~~~~~~~~~~~~~ - -A boot environment is a dataset which contains a bootable -instance of an operating system. - -Install ``bieaz`` from COPR. Optionally install ``python3-dnf-plugin-rozb3`` from COPR -for dnf integration. - -See `home page `__ for details. diff --git a/docs/Getting Started/Fedora/Root on ZFS/5-bootloader.rst b/docs/Getting Started/Fedora/Root on ZFS/5-bootloader.rst index 9cef85c..449e385 100644 --- a/docs/Getting Started/Fedora/Root on ZFS/5-bootloader.rst +++ b/docs/Getting Started/Fedora/Root on ZFS/5-bootloader.rst @@ -212,7 +212,7 @@ Post installaion Install package groups:: - dnf group list # query package groups + dnf group list --hidden -v # query package groups dnf group install 'i3 Desktop' dnf group install 'Fedora Workstation' # GNOME dnf group install 'Web Server' diff --git a/docs/Getting Started/NixOS/index.rst b/docs/Getting Started/NixOS/index.rst index 2cf8cf1..ae214cf 100644 --- a/docs/Getting Started/NixOS/index.rst +++ b/docs/Getting Started/NixOS/index.rst @@ -70,7 +70,7 @@ Contribute #. Launch an ephemeral nix-shell with the following packages:: nix-shell -p python39 python39Packages.pip gnumake \ - python39Packages.setuptools python39Packages.sphinx + python39Packages.setuptools #. Create python virtual environment and install packages:: @@ -84,7 +84,6 @@ Contribute #. Test:: - cd docs make html sensible-browser _build/html/index.html diff --git a/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/1-preparation.rst b/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/1-preparation.rst index 34fa88a..3bd5cf8 100644 --- a/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/1-preparation.rst +++ b/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/1-preparation.rst @@ -10,7 +10,7 @@ Preparation #. Download a variant of `Rocky Linux 8.4 Live ISO `__ and boot from it. -#. Set root password or ``/root/authorized_keys``. +#. Set root password or ``/root/.ssh/authorized_keys``. #. Start SSH server:: echo PermitRootLogin yes >> /etc/ssh/sshd_config @@ -42,8 +42,6 @@ Preparation #. Install ZFS packages:: - dnf config-manager --disable zfs - dnf config-manager --enable zfs-kmod dnf install -y epel-release dnf install -y zfs diff --git a/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/2-system-installation.rst b/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/2-system-installation.rst index 309d8a4..bf0f127 100644 --- a/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/2-system-installation.rst +++ b/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/2-system-installation.rst @@ -251,3 +251,8 @@ System Installation source /mnt/etc/os-release RHEL_ZFS_REPO_NEW=https://zfsonlinux.org/epel/zfs-release.el${VERSION_ID/./_}.noarch.rpm dnf install --installroot=/mnt -y $RHEL_ZFS_REPO_NEW || true + +#. Optional: enable boot environment support and dnf integration:: + + dnf --installroot=/mnt copr enable -y m0p/bieaz + dnf --installroot=/mnt install -y bieaz python3-dnf-plugin-rozb3 diff --git a/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/4-optional-configuration.rst b/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/4-optional-configuration.rst deleted file mode 100644 index bdb431b..0000000 --- a/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/4-optional-configuration.rst +++ /dev/null @@ -1,21 +0,0 @@ -.. highlight:: sh - -Optional Configuration -====================== - -.. contents:: Table of Contents - :local: - -Skip to `bootloader <5-bootloader.html>`__ section if -no optional configuration is needed. - -Boot environment manager -~~~~~~~~~~~~~~~~~~~~~~~~ - -A boot environment is a dataset which contains a bootable -instance of an operating system. - -Install ``bieaz`` from COPR. Optionally install ``python3-dnf-plugin-rozb3`` from COPR -for dnf integration. - -See `home page `__ for details. diff --git a/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/5-bootloader.rst b/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/5-bootloader.rst index df01d59..8452f81 100644 --- a/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/5-bootloader.rst +++ b/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/5-bootloader.rst @@ -234,5 +234,5 @@ Post installaion Install package groups:: - dnf group list # query package groups + dnf group list --hidden -v # query package groups dnf group install 'Virtualization Host' diff --git a/docs/Getting Started/RHEL-based distro/index.rst b/docs/Getting Started/RHEL-based distro/index.rst index dc08da5..6403129 100644 --- a/docs/Getting Started/RHEL-based distro/index.rst +++ b/docs/Getting Started/RHEL-based distro/index.rst @@ -40,7 +40,7 @@ For RHEL/CentOS versions 6 and 7 run:: yum install https://zfsonlinux.org/epel/zfs-release$(rpm -E %distro).noarch.rpm rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-zfsonlinux -And for RHEL/CentOS 8 and newer:: +And for RHEL/CentOS 8 and newer (tested with `Rocky Linux `__ 8):: source /etc/os-release dnf install https://zfsonlinux.org/epel/zfs-release.el${VERSION_ID/./_}.noarch.rpm