Merge branch 'cosmetic_cleanups'

README.md

@@ -40,14 +40,14 @@ As of 20.04, Canonical makes available an experimental ZFS installer on Ubuntu D
 The advantages of this project over the Ubuntu installer are:
 
 1. it supports pools configuration;
-2. it allows specifying the RAID type;
-3. it allows customization of the disk partitions;
-4. it supports additional features (e.g. encryption);
-5. it supports new OpenZFS versions, via PPA `jonathonf/zfs`.
-6. it supports many more operating systems;
-7. it supports unattended installations, via custom scripts;
-8. it installs a convenient trimming job for ZFS pools;
-9. it's easy to extend.
+1. it allows specifying the RAID type;
+1. it allows customization of the disk partitions;
+1. it supports additional features (e.g. encryption);
+1. it supports new OpenZFS versions, via PPA `jonathonf/zfs`.
+1. it supports many more operating systems;
+1. it supports unattended installations, via custom scripts;
+1. it installs a convenient trimming job for ZFS pools;
+1. it's easy to extend.
 
 The disadvantages are:
 

install-zfs.sh

@@ -43,6 +43,7 @@ v_suitable_disks=()          # (/dev/by-id/disk_id, ...); scope: find_suitable_d
 # Note that Linux Mint is "Linuxmint" from v20 onwards. This actually helps, since some operations are
 # specific to it.
 
+c_ppa=ppa:jonathonf/zfs
 c_efi_system_partition_size=512 # megabytes
 c_default_boot_partition_size=2048 # megabytes
 c_default_bpool_tweaks="-o ashift=12"
@@ -166,7 +167,7 @@ This script needs to be run with admin permissions, from a Live CD.
 The procedure can be entirely automated via environment variables:
 
 - ZFS_OS_INSTALLATION_SCRIPT : path of a script to execute instead of Ubiquity (see dedicated section below)
-- ZFS_USE_PPA                : set to 1 to use packages from `ppa:jonathonf/zfs` (automatically set to true if the O/S version doesn'\''t ship at least v0.8)
+- ZFS_USE_PPA                : set to 1 to use packages from `'"$c_ppa"'` (automatically set to true if the O/S version doesn'\''t ship at least v0.8)
 - ZFS_SELECTED_DISKS         : full path of the devices to create the pool on, comma-separated
 - ZFS_BOOT_PARTITION_SIZE    : integer number with `M` or `G` suffix (defaults to `'${c_default_boot_partition_size}M'`)
 - ZFS_PASSPHRASE             : set non-blank to encrypt the pool, and blank not to. if unset, it will be asked.
@@ -660,11 +661,11 @@ function install_host_packages {
 
   if [[ $v_use_ppa == "1" ]]; then
     if [[ ${ZFS_SKIP_LIVE_ZFS_MODULE_INSTALL:-} != "1" ]]; then
-      add-apt-repository --yes ppa:jonathonf/zfs
+      add-apt-repository --yes "$c_ppa"
       apt update
 
       # Libelf-dev allows `CONFIG_STACK_VALIDATION` to be set - it's optional, but good to have.
-      # Module compilation log: `/var/lib/dkms/zfs/0.8.2/build/make.log` (adjust according to version).
+      # Module compilation log: `/var/lib/dkms/zfs/**/*/make.log` (adjust according to version).
       #
       echo "zfs-dkms zfs-dkms/note-incompatible-licenses note true" | debconf-set-selections
       apt install --yes libelf-dev zfs-dkms
@@ -1105,7 +1106,7 @@ function install_jail_zfs_packages {
   print_step_info_header
 
   if [[ $v_use_ppa == "1" ]]; then
-    chroot_execute "add-apt-repository --yes ppa:jonathonf/zfs"
+    chroot_execute "add-apt-repository --yes $c_ppa"
 
     chroot_execute "apt update"