From 41ea6da337d6d458fabe8e432f548630eaeb0bee Mon Sep 17 00:00:00 2001 From: Richard Laager Date: Fri, 29 Oct 2021 14:01:47 -0500 Subject: [PATCH] Reorder SSH step This reduces the number of steps in the "First Boot" section that are not related to the first boot. Reported-by: Jonathan Dumont Signed-off-by: Richard Laager --- .../Debian/Debian Buster Root on ZFS.rst | 14 ++++++------- .../Ubuntu/Ubuntu 20.04 Root on ZFS.rst | 20 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/Getting Started/Debian/Debian Buster Root on ZFS.rst b/docs/Getting Started/Debian/Debian Buster Root on ZFS.rst index 843f581..c04a36a 100644 --- a/docs/Getting Started/Debian/Debian Buster Root on ZFS.rst +++ b/docs/Getting Started/Debian/Debian Buster Root on ZFS.rst @@ -741,6 +741,13 @@ Step 4: System Configuration cp /usr/share/systemd/tmp.mount /etc/systemd/system/ systemctl enable tmp.mount +#. Optional: Install SSH:: + + apt install --yes openssh-server + + vi /etc/ssh/sshd_config + # Set: PermitRootLogin yes + #. Optional (but kindly requested): Install popcon The ``popularity-contest`` package reports the list of packages install @@ -850,13 +857,6 @@ Step 5: GRUB Installation Step 6: First Boot ------------------ -#. Optional: Install SSH:: - - apt install --yes openssh-server - - vi /etc/ssh/sshd_config - # Set: PermitRootLogin yes - #. Optional: Snapshot the initial installation:: zfs snapshot bpool/BOOT/debian@install diff --git a/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS.rst b/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS.rst index 05a2b20..65891e9 100644 --- a/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS.rst +++ b/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS.rst @@ -920,6 +920,13 @@ Step 4: System Configuration zfs root `__. +#. Optional: Install SSH:: + + apt install --yes openssh-server + + vi /etc/ssh/sshd_config + # Set: PermitRootLogin yes + Step 5: GRUB Installation ------------------------- @@ -1035,16 +1042,6 @@ Step 5: GRUB Installation sed -Ei "s|/mnt/?|/|" /etc/zfs/zfs-list.cache/* -Step 6: First Boot ------------------- - -#. Optional: Install SSH:: - - apt install --yes openssh-server - - vi /etc/ssh/sshd_config - # Set: PermitRootLogin yes - #. Exit from the ``chroot`` environment back to the LiveCD environment:: exit @@ -1062,6 +1059,9 @@ Step 6: First Boot Wait for the newly installed system to boot normally. Login as root. +Step 6: First Boot +------------------ + #. Install GRUB to additional disks: For a UEFI mirror or raidz topology only::