[gentoo-commits] proj/genkernel:ryao commit in: defaults/

["Richard Yao" <ryao@gentoo.org>]

commit:     96fc5959f5f911a019079fe4cf6e808448d6a0d4
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 09:31:33 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 09:52:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=96fc5959

Import pool after ZFS module finishes loading

There is a race between ZFS module initialization and our attempt to
import pools. We address this by doing a busy wait for the /dev/zfs
device to appear. We wait a maximum of 5 seconds for the device to
appear.

We also slightly alter output messages to be more readable.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 defaults/initrd.scripts | 61 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index c8e7abb..bc647d8 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -636,6 +636,12 @@ chooseKeymap() {
 	fi
 }
 
+# This helper function is to be called using call_func_timeout.
+# It enables us to wait a reasonable amount of time until /dev/zfs appears.
+waitForZFS() {
+	while [ ! -c /dev/zfs ]; do echo >/dev/null; done;
+}
+
 startVolumes() {
 	#good_msg 'Checking if volumes need to be started...'
 
@@ -714,40 +720,47 @@ startVolumes() {
 	
 	if [ "${USE_ZFS}" = '1' ]
 	then
-		if [ -z "${ZFS_POOL}" ]
-		then
-			good_msg "Importing ZFS pools"
 
-			/sbin/zpool import -N -a ${ZPOOL_FORCE}
-
-			if [ "$?" = '0' ]
-			then
-				good_msg "Importing ZFS pools succeeded"
-			else
-				bad_msg "Imported ZFS pools failed"
-			fi
+		# Avoid race involving asynchronous module loading
+		if call_func_timeout wait_for_ZFS 5
+		then
+			bad_msg "Cannot import ZFS pool because /dev/zfs is missing"
 		else
-
-			if [ "$(zpool list -H -o name ${ZFS_POOL} 2>&1)" = "$ZFS_POOL" ]
+			if [ -z "${ZFS_POOL}" ]
 			then
-				good_msg "ZFS pool ${ZFS_POOL} already imported."
+				good_msg "Importing ZFS pools"
 
-				if [ -n "${CRYPT_ROOT}" -o -n "${CRYPT_SWAP}" ]
+				/sbin/zpool import -N -a ${ZPOOL_FORCE}
+
+				if [ "$?" = '0' ]
 				then
-					good_msg "LUKS detected. Reimporting ${ZFS_POOL}"
-					/sbin/zpool export -f "${ZFS_POOL}"
-					/sbin/zpool import -N ${ZPOOL_FORCE} "${ZFS_POOL}"
+					good_msg "Importing ZFS pools succeeded"
+				else
+					bad_msg "Imported ZFS pools failed"
 				fi
 			else
-				good_msg "Importing ZFS pool ${ZFS_POOL}"
-
-				/sbin/zpool import -N ${ZPOOL_FORCE} "${ZFS_POOL}"
 
-				if [ "$?" = '0' ]
+				if [ "$(zpool list -H -o name ${ZFS_POOL} 2>&1)" = "$ZFS_POOL" ]
 				then
-					good_msg "Importing ${ZFS_POOL} succeeded"
+					good_msg "ZFS pool ${ZFS_POOL} already imported."
+
+					if [ -n "${CRYPT_ROOT}" -o -n "${CRYPT_SWAP}" ]
+					then
+						good_msg "LUKS detected. Reimporting ${ZFS_POOL}"
+						/sbin/zpool export -f "${ZFS_POOL}"
+						/sbin/zpool import -N ${ZPOOL_FORCE} "${ZFS_POOL}"
+					fi
 				else
-					bad_msg "Importing ${ZFS_POOL} failed"
+					good_msg "Importing ZFS pool ${ZFS_POOL}"
+
+					/sbin/zpool import -N ${ZPOOL_FORCE} "${ZFS_POOL}"
+
+					if [ "$?" = '0' ]
+					then
+						good_msg "Import of ${ZFS_POOL} succeeded"
+					else
+						bad_msg "Import of ${ZFS_POOL} failed"
+					fi
 				fi
 			fi
 		fi