Debian/Ubuntu: Add some blank lines

The convention here is to add a blank line between commands that
cannot be copied-and-pasted together.  apt is such a command, as it
will eat the input from the paste.
This commit is contained in:
Richard Laager
2020-12-12 03:49:41 -06:00
parent 6bfb226bf0
commit 3d862230eb
5 changed files with 25 additions and 0 deletions

View File

@@ -51,7 +51,9 @@ Contributing
#. Install the tools:: #. Install the tools::
sudo apt install python3-pip sudo apt install python3-pip
pip3 install -r docs/requirements.txt pip3 install -r docs/requirements.txt
# Add ~/.local/bin to your $PATH, e.g. by adding this to ~/.bashrc: # Add ~/.local/bin to your $PATH, e.g. by adding this to ~/.bashrc:
PATH=$HOME/.local/bin:$PATH PATH=$HOME/.local/bin:$PATH
@@ -117,6 +119,7 @@ Step 1: Prepare The Install Environment
convenient:: convenient::
sudo apt install --yes openssh-server sudo apt install --yes openssh-server
sudo systemctl restart ssh sudo systemctl restart ssh
**Hint:** You can find your IP address with **Hint:** You can find your IP address with
@@ -131,7 +134,9 @@ Step 1: Prepare The Install Environment
apt install --yes debootstrap gdisk dkms dpkg-dev \ apt install --yes debootstrap gdisk dkms dpkg-dev \
linux-headers-$(uname -r) linux-headers-$(uname -r)
apt install --yes -t buster-backports --no-install-recommends zfs-dkms apt install --yes -t buster-backports --no-install-recommends zfs-dkms
modprobe zfs modprobe zfs
apt install --yes -t buster-backports zfsutils-linux apt install --yes -t buster-backports zfsutils-linux
@@ -304,6 +309,7 @@ Step 2: Disk Formatting
- LUKS:: - LUKS::
apt install --yes cryptsetup apt install --yes cryptsetup
cryptsetup luksFormat -c aes-xts-plain64 -s 512 -h sha256 ${DISK}-part4 cryptsetup luksFormat -c aes-xts-plain64 -s 512 -h sha256 ${DISK}-part4
cryptsetup luksOpen ${DISK}-part4 luks1 cryptsetup luksOpen ${DISK}-part4 luks1
zpool create \ zpool create \
@@ -592,6 +598,7 @@ Step 4: System Configuration
ln -s /proc/self/mounts /etc/mtab ln -s /proc/self/mounts /etc/mtab
apt update apt update
apt install --yes console-setup locales apt install --yes console-setup locales
Even if you prefer a non-English system language, always ensure that Even if you prefer a non-English system language, always ensure that
@@ -602,7 +609,9 @@ Step 4: System Configuration
#. Install ZFS in the chroot environment for the new system:: #. Install ZFS in the chroot environment for the new system::
apt install --yes dpkg-dev linux-headers-amd64 linux-image-amd64 apt install --yes dpkg-dev linux-headers-amd64 linux-image-amd64
apt install --yes zfs-initramfs apt install --yes zfs-initramfs
echo REMAKE_INITRD=yes > /etc/dkms/zfs.conf echo REMAKE_INITRD=yes > /etc/dkms/zfs.conf
#. For LUKS installs only, setup ``/etc/crypttab``:: #. For LUKS installs only, setup ``/etc/crypttab``::
@@ -632,6 +641,7 @@ Step 4: System Configuration
- Install GRUB for UEFI booting:: - Install GRUB for UEFI booting::
apt install dosfstools apt install dosfstools
mkdosfs -F 32 -s 1 -n EFI ${DISK}-part2 mkdosfs -F 32 -s 1 -n EFI ${DISK}-part2
mkdir /boot/efi mkdir /boot/efi
echo /dev/disk/by-uuid/$(blkid -s UUID -o value ${DISK}-part2) \ echo /dev/disk/by-uuid/$(blkid -s UUID -o value ${DISK}-part2) \
@@ -1012,6 +1022,7 @@ Go through `Step 1: Prepare The Install Environment
For LUKS, first unlock the disk(s):: For LUKS, first unlock the disk(s)::
apt install --yes cryptsetup apt install --yes cryptsetup
cryptsetup luksOpen /dev/disk/by-id/scsi-SATA_disk1-part4 luks1 cryptsetup luksOpen /dev/disk/by-id/scsi-SATA_disk1-part4 luks1
# Repeat for additional disks, if this is a mirror or raidz topology. # Repeat for additional disks, if this is a mirror or raidz topology.

View File

@@ -55,7 +55,9 @@ Contributing
#. Install the tools:: #. Install the tools::
sudo apt install python3-pip sudo apt install python3-pip
pip3 install -r docs/requirements.txt pip3 install -r docs/requirements.txt
# Add ~/.local/bin to your $PATH, e.g. by adding this to ~/.bashrc: # Add ~/.local/bin to your $PATH, e.g. by adding this to ~/.bashrc:
PATH=$HOME/.local/bin:$PATH PATH=$HOME/.local/bin:$PATH

View File

@@ -56,7 +56,9 @@ Contributing
#. Install the tools:: #. Install the tools::
sudo apt install python3-pip sudo apt install python3-pip
pip3 install -r docs/requirements.txt pip3 install -r docs/requirements.txt
# Add ~/.local/bin to your $PATH, e.g. by adding this to ~/.bashrc: # Add ~/.local/bin to your $PATH, e.g. by adding this to ~/.bashrc:
PATH=$HOME/.local/bin:$PATH PATH=$HOME/.local/bin:$PATH

View File

@@ -53,7 +53,9 @@ Contributing
#. Install the tools:: #. Install the tools::
sudo apt install python3-pip sudo apt install python3-pip
pip3 install -r docs/requirements.txt pip3 install -r docs/requirements.txt
# Add ~/.local/bin to your $PATH, e.g. by adding this to ~/.bashrc: # Add ~/.local/bin to your $PATH, e.g. by adding this to ~/.bashrc:
PATH=$HOME/.local/bin:$PATH PATH=$HOME/.local/bin:$PATH
@@ -232,6 +234,7 @@ Step 2: Setup ZFS
#. Install ZFS:: #. Install ZFS::
apt update apt update
apt install pv zfs-initramfs apt install pv zfs-initramfs
**Note:** Since this is the first boot, you may get ``Waiting for cache **Note:** Since this is the first boot, you may get ``Waiting for cache

View File

@@ -183,7 +183,9 @@ Contributing
#. Install the tools:: #. Install the tools::
sudo apt install python3-pip sudo apt install python3-pip
pip3 install -r docs/requirements.txt pip3 install -r docs/requirements.txt
# Add ~/.local/bin to your $PATH, e.g. by adding this to ~/.bashrc: # Add ~/.local/bin to your $PATH, e.g. by adding this to ~/.bashrc:
PATH=$HOME/.local/bin:$PATH PATH=$HOME/.local/bin:$PATH
@@ -258,6 +260,7 @@ Step 1: Prepare The Install Environment
#. Install ZFS in the Live CD environment:: #. Install ZFS in the Live CD environment::
apt install --yes debootstrap gdisk zfs-initramfs apt install --yes debootstrap gdisk zfs-initramfs
systemctl stop zed systemctl stop zed
Step 2: Disk Formatting Step 2: Disk Formatting
@@ -710,6 +713,7 @@ Step 4: System Configuration
Install your preferred text editor:: Install your preferred text editor::
apt install --yes nano apt install --yes nano
apt install --yes vim apt install --yes vim
Installing the full ``vim`` package fixes terminal problems that occur when Installing the full ``vim`` package fixes terminal problems that occur when
@@ -818,6 +822,7 @@ Step 4: System Configuration
- For an unencrypted mirror or raidz topology:: - For an unencrypted mirror or raidz topology::
apt install --yes mdadm apt install --yes mdadm
# Adjust the level (ZFS raidz = MD raid5, raidz2 = raid6) and # Adjust the level (ZFS raidz = MD raid5, raidz2 = raid6) and
# raid-devices if necessary and specify the actual devices. # raid-devices if necessary and specify the actual devices.
mdadm --create /dev/md0 --metadata=1.2 --level=mirror \ mdadm --create /dev/md0 --metadata=1.2 --level=mirror \
@@ -829,6 +834,7 @@ Step 4: System Configuration
- For an encrypted (LUKS or ZFS native encryption) single-disk install:: - For an encrypted (LUKS or ZFS native encryption) single-disk install::
apt install --yes cryptsetup apt install --yes cryptsetup
echo swap ${DISK}-part2 /dev/urandom \ echo swap ${DISK}-part2 /dev/urandom \
swap,cipher=aes-xts-plain64:sha256,size=512 >> /etc/crypttab swap,cipher=aes-xts-plain64:sha256,size=512 >> /etc/crypttab
echo /dev/mapper/swap none swap defaults 0 0 >> /etc/fstab echo /dev/mapper/swap none swap defaults 0 0 >> /etc/fstab
@@ -837,6 +843,7 @@ Step 4: System Configuration
topology:: topology::
apt install --yes cryptsetup mdadm apt install --yes cryptsetup mdadm
# Adjust the level (ZFS raidz = MD raid5, raidz2 = raid6) and # Adjust the level (ZFS raidz = MD raid5, raidz2 = raid6) and
# raid-devices if necessary and specify the actual devices. # raid-devices if necessary and specify the actual devices.
mdadm --create /dev/md0 --metadata=1.2 --level=mirror \ mdadm --create /dev/md0 --metadata=1.2 --level=mirror \