Move ZFS binary check outside of commandline loop

defaults/linuxrc

@@ -97,17 +97,12 @@ do
 			USE_DMRAID_NORMAL=1
 		;;
 		dozfs*)
-			if [ ! -x /sbin/zfs ]; then
-				USE_ZFS=0
-				bad_msg 'zfs binary not found: aborting use of zfs!'
-			else
 			USE_ZFS=1
 			MY_HWOPTS="${MY_HWOPTS} zfs"
 			if [ "${x#*=}" = 'force' ]
 			then
 				ZPOOL_FORCE=-f
 			fi
-			fi
 		;;
 		# Debug Options
 		debug)
@@ -253,6 +248,14 @@ then
 	REAL_ROOT="${FAKE_ROOT}"
 fi
 
+# Disable ZFS when support is missing
+if [ "USE_ZFS" = "1" -a ! -x /sbin/zfs ]
+then
+	USE_ZFS=0
+	MY_HWOPTS=$(echo ${MY_HWOPTS} | sed -e 's/ zfs//g')
+	bad_msg 'zfs binary not found: aborting use of zfs!'
+fi
+
 splash 'init'
 
 cmdline_hwopts