confz

commit a2f05a26b7d9020636cc55314bab749376e3deb4
parent b561858768558a21c91595201e992ee0f3d7c66b
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date:   Mon, 20 Apr 2015 15:29:55 +0200

mdraid empty label check
Diffstat:
M
zsh-functions/confz_fs_init
 | 
10
+++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/zsh-functions/confz_fs_init b/zsh-functions/confz_fs_init
@@ -138,7 +138,7 @@ confz_swapon_check() {
 
 # set up /dev/md* device
 confz_mdraid_check() {
-	local level out seen_level seen_header devices present
+	local level out seen_level seen_header devices all_empty
 	local -a seen_devices devices
 	local -A level_map
 
@@ -199,18 +199,18 @@ confz_mdraid_check() {
 		return 0
 	fi
 
+	all_empty=1
 	for device in $devices; do
+		# all devices either need to have empty labels or be linux_raid_member
 		fs_blkid_probe $device
-		(( $+present )) || present=$fs_blkid_result
-		[[ $present != $fs_blkid_result ]] || \
-			die "$0: only some devices present"
 		if ! (($fs_blkid_result)); then
 			[[ ${fs_blkid_output[TYPE]:-} == linux_raid_member ]] || \
 				die "$0: non-raid label present on device: ${(qqq)device}"
+			all_empty=0
 		fi
 	done
 
-	if (($present)); then
+	if (($all_empty)); then
 		# empty labels
 		do_command=( mdadm --create -l $level --metadata=$vars[metadata] -n $#devices $vars[md_device] $devices )
 	else