X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=btrbk-run;h=2eb53c1e25700c6b7dad52e02a9eaf1bcdab2d2b;hb=63e3670ab59869f5f74904edbe64daa943fad15f;hp=dcca4b7dd036dca6fb662f40e9904a824160e6bd;hpb=8417f19f15700275dd489ac84f7b10ee1b26059c;p=distro-setup diff --git a/btrbk-run b/btrbk-run index dcca4b7..2eb53c1 100644 --- a/btrbk-run +++ b/btrbk-run @@ -441,16 +441,21 @@ else root_size=$(( 1024 * 1024 * 2000 )) #2tb percent_used=10 zone=$(date +%z) - elif tmpstr=$(timeout -s 9 6 ssh root@$h "mkdir -p /mnt/root/btrbk /mnt/o/btrbk && date +%z && df --output=size,pcent / | tail -n1"); then - IFS=" " read -r -a remote_info <<<"$tmpstr" - - zone=${remote_info[0]} - root_size=${remote_info[1]} - percent_used=${remote_info[2]%%%} - - if (( ${#remote_info[@]} != 3 )); then - die "error: didnt get 3 fields in test ssh to target $h. investigate" + elif remote_str=$(timeout -s 9 6 ssh root@$h "mkdir -p /mnt/root/btrbk /mnt/o/btrbk && date +%z && df --output=size,pcent / | tail -n1"); then + mapfile -t tmp_array <<<"$remote_str" + zone="${tmp_array[0]}" + IFS=" " read -r root_size percent_used <<<"${tmp_array[1]}" + percent_used=${percent_used%%%} + + if (( ${#tmp_array[@]} != 2 )); then + die "error: didnt get 2 lines in test ssh to target $h. investigate" fi + case $percent_used in + [0-9]|[1-9][0-9]) : ;; + *) + die "error: didnt get percent disk use in test ssh to target $h. investigate" + ;; + esac else sshfail+=($h) continue