commit 936508cb319fcc19cd6cc8855bdfd3e889e64d5d parent 8c0e4fb50805a822c160f5d67d7a646537103748 Author: Jan Pobrislo <ccx@webprojekty.cz> Date: Wed, 13 Feb 2019 08:55:05 +0100 Handle non-existent md devices Diffstat:
| M | zsh-functions/confz_fs_init | | | 18 | ++++++++++-------- |
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/zsh-functions/confz_fs_init b/zsh-functions/confz_fs_init @@ -397,16 +397,18 @@ confz_mdraid_check() { fi done <<<$out - [[ $level == $seen_level ]] || \ - die "$0: raid level mismatch." \ - "expected: ${(q)level} got: ${(q)seen_level}" + if (($seen_header)); then + [[ $level == $seen_level ]] || \ + die "$0: raid level mismatch." \ + "expected: ${(q)level} got: ${(q)seen_level}" - [[ ${(o)device_numbers} == ${(o)seen_devices} ]] || \ - die $0$': raid device mismatch\nexpected:' \ - ${(oqqq)device_numbers}$'\ngot:' \ - ${(oqqq)seen_devices} + [[ ${(o)device_numbers} == ${(o)seen_devices} ]] || \ + die $0$': raid device mismatch\nexpected:' \ + ${(oqqq)device_numbers}$'\ngot:' \ + ${(oqqq)seen_devices} - return 0 + return 0 + fi fi all_empty=1