From d8536b46882b019aa18284c8b16d1f03f0a537d2 Mon Sep 17 00:00:00 2001 From: unixbird-ps-storvix <130553603+unixbird-ps-storvix@users.noreply.github.com> Date: Fri, 29 Dec 2023 15:50:00 +0100 Subject: [PATCH] Update zfs The command cfgadm does not show disks but only usb related devices. Diskinfo does show a list of disks. Single quotes prevents expansion. '${DISK}' will still be '${DISK}', not an actual disk. --- provisioners/zfs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/provisioners/zfs b/provisioners/zfs index 815b754..7d4b01f 100755 --- a/provisioners/zfs +++ b/provisioners/zfs @@ -1,7 +1,11 @@ #!/usr/bin/env bash -eux # Use the first disk not assigned to a zpool already to create the data pool. -for DISK in $(cfgadm -al | awk -F\/ '/dsk/{ print $3 }' | awk '{ print $1 }'); do - if [[ -z $(zpool list -v | ggrep -E '^\s+${DISK}') ]]; then +for DISK in $(diskinfo -H | awk '{ print $2 }') +do + echo "Checking ${DISK}" + if [[ -z $(zpool list -H -v | egrep -e '^[[:blank:]]*'"${DISK}") ]] + then + echo "Found ${DISK}" echo "[II] Adding data zpool using whole disk ${DISK}" pfexec zpool create -f tank ${DISK} break