rei-forks/zfs-installer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #186 from saveriomiroddi/include_all_disks_in_disks_log

Browse Source 
Include all disks in the disk log
This commit is contained in:
Saverio Miroddi 2021-04-26 23:24:14 +02:00 committed by GitHub
commit b9b344c39d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
install-zfs.sh
View File

@ -340,6 +340,25 @@ In such cases, the module building may fail abruptly, either without visible err
fi 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 { function find_suitable_disks {
print_step_info_header print_step_info_header
@ -348,9 +367,6 @@ function find_suitable_disks {
# #
udevadm trigger 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 candidate_disk_ids
local mounted_devices local mounted_devices
@ -380,14 +396,6 @@ function find_suitable_disks {
v_suitable_disks+=("$disk_id") v_suitable_disks+=("$disk_id")
fi fi
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") done < <(echo -n "$candidate_disk_ids")
if [[ ${#v_suitable_disks[@]} -eq 0 ]]; then if [[ ${#v_suitable_disks[@]} -eq 0 ]]; then
@ -1495,6 +1503,7 @@ store_running_processes
check_prerequisites check_prerequisites
display_intro_banner display_intro_banner
check_system_memory check_system_memory
save_disks_log
find_suitable_disks find_suitable_disks
distro_dependent_invoke "set_zfs_ppa_requirement" distro_dependent_invoke "set_zfs_ppa_requirement"
register_exit_hook register_exit_hook