From 26f0057c4966880abac872d280943d03961bb0b8 Mon Sep 17 00:00:00 2001
From: Saverio Miroddi <saverio.pub2@gmail.com>
Date: Mon, 26 Apr 2021 23:23:46 +0200
Subject: [PATCH] Include all disks in the disk log

---
 install-zfs.sh | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/install-zfs.sh b/install-zfs.sh
index 92e88b9..b14248f 100755
--- a/install-zfs.sh
+++ b/install-zfs.sh
@@ -340,6 +340,25 @@ In such cases, the module building may fail abruptly, either without visible err
     fi
 }
 
+function save_disks_log {
+  print_step_info_header
+
+  # shellcheck disable=SC2012 # `ls` may clean the output, but in this case, it doesn't matter
+  ls -l /dev/disk/by-id | tail -n +2 | perl -lane 'print "@F[8..10]"' > "$c_disks_log"
+
+  all_disk_ids=$(find /dev/disk/by-id -mindepth 1 -regextype awk -not -regex '.+-part[0-9]+$' | sort)
+
+  while read -r disk_id || [[ -n $disk_id ]]; do
+    cat >> "$c_disks_log" << LOG
+
+## DEVICE: $disk_id ################################
+
+$(udevadm info --query=property "$(readlink -f "$disk_id")")
+
+LOG
+  done < <(echo -n "$all_disk_ids")
+}
+
 function find_suitable_disks {
   print_step_info_header
 
@@ -348,9 +367,6 @@ function find_suitable_disks {
   #
   udevadm trigger
 
-  # shellcheck disable=SC2012 # `ls` may clean the output, but in this case, it doesn't matter
-  ls -l /dev/disk/by-id | tail -n +2 | perl -lane 'print "@F[8..10]"' > "$c_disks_log"
-
   local candidate_disk_ids
   local mounted_devices
 
@@ -380,14 +396,6 @@ function find_suitable_disks {
         v_suitable_disks+=("$disk_id")
       fi
     fi
-
-    cat >> "$c_disks_log" << LOG
-
-## DEVICE: $disk_id ################################
-
-$(udevadm info --query=property "$(readlink -f "$disk_id")")
-
-LOG
   done < <(echo -n "$candidate_disk_ids")
 
   if [[ ${#v_suitable_disks[@]} -eq 0 ]]; then
@@ -1495,6 +1503,7 @@ store_running_processes
 check_prerequisites
 display_intro_banner
 check_system_memory
+save_disks_log
 find_suitable_disks
 distro_dependent_invoke "set_zfs_ppa_requirement"
 register_exit_hook