From: Richard Yao <ryao@cs.stonybrook.edu>
Date: Sat, 7 Apr 2012 21:17:50 +0000 (-0400)
Subject: Move ZFS binary check outside of commandline loop
X-Git-Tag: v3.4.30~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=391a9b996934f1590fb663674ddbb1bff1cb60aa;p=genkernel.git

Move ZFS binary check outside of commandline loop
---

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 9ac2c7c..4a16462 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -97,16 +97,11 @@ 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
+			USE_ZFS=1
+			MY_HWOPTS="${MY_HWOPTS} zfs"
+			if [ "${x#*=}" = 'force' ]
+			then
+				ZPOOL_FORCE=-f
 			fi
 		;;
 		# Debug Options
@@ -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