confz

commit eefbc8dfdecdc08848aa6629f121a73187c45da4
parent d6a7df6cff984425b79f7ca9c0d49b54c681444c
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date:   Wed, 13 Feb 2019 08:17:48 +0100

Allow mdadm --detail to die with 'Array ... does not exist' (exitcode 1)
Diffstat:
M
zsh-functions/confz_fs_init
 | 
11
++++++++---

1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/zsh-functions/confz_fs_init b/zsh-functions/confz_fs_init
@@ -337,7 +337,7 @@ confz_swapon_check() {
 
 # set up /dev/md* device
 confz_mdraid_check() {
-	local line level out seen_level seen_header devices all_empty
+	local line level out seen_level seen_header devices all_empty ret
 	local -a seen_devices devices device_numbers
 	local -A level_map
 
@@ -376,8 +376,13 @@ confz_mdraid_check() {
 	done
 
 	if [[ -b $vars[md_device] ]]; then
-		out=$( mdadm --detail $vars[md_device] ) || \
-			die "$0: mdadm --detail ${(qqq)vars[md_device]} returned $?"
+		out=$( mdadm --detail $vars[md_device] )
+		ret=$?
+		case ret in
+			(0) ;;
+			# (1) return 1;;
+			(*) die "$0: mdadm --detail ${(qqq)vars[md_device]} returned $?";;
+		esac
 		seen_header=0
 		while read line; do
 			if ! (($seen_header)); then